Revert "asoc: bolero: switch clk to VA_CLK for LPI SVA"

This reverts commit 87d4e3c1b946663068d1add23fc88c01ee7a8cdd.

Change-Id: Ie2e5d7a9ce900d3f390481d3fc7ac207260ab315

asoc/codecs/bolero/bolero-cdc.c

@@ -1071,7 +1071,7 @@ EXPORT_SYMBOL(bolero_register_wake_irq);
  *
  * @component: pointer to codec component instance.
  *
- * @clk_src: clk source
+ * @clk_src: 0 for TX_RCG and 1 for VA_RCG
  *
  * Returns 0 on success or -EINVAL on error.
  */

asoc/codecs/bolero/tx-macro.c

@@ -179,7 +179,6 @@ struct tx_macro_priv {
 	int amic_sample_rate;
 	bool lpi_enable;
 	bool register_event_listener;
-	u16 default_clk_id;
 };
 
 static bool tx_macro_get_data(struct snd_soc_component *component,
@@ -1818,11 +1817,11 @@ static const struct snd_soc_dapm_widget tx_macro_dapm_widgets_v3[] = {
 			   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
 			   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
 
-	SND_SOC_DAPM_SUPPLY_S("TX_SWR_CLK", -1, SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SUPPLY_S("TX_SWR_CLK", 0, SND_SOC_NOPM, 0, 0,
 			tx_macro_tx_swr_clk_event,
 			SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 
-	SND_SOC_DAPM_SUPPLY_S("VA_SWR_CLK", -1, SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SUPPLY_S("VA_SWR_CLK", 0, SND_SOC_NOPM, 0, 0,
 			tx_macro_va_swr_clk_event,
 			SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 };
@@ -2870,45 +2869,12 @@ static int tx_macro_clk_switch(struct snd_soc_component *component, int clk_src)
 			"%s: priv is null for macro!\n", __func__);
 		return -EINVAL;
 	}
-	dev_dbg(component->dev,
-		"%s: va_swr_clk_cnt %d, tx_swr_clk_cnt %d, tx_clk_status %d\n",
-		__func__, tx_priv->va_swr_clk_cnt,
-		tx_priv->tx_swr_clk_cnt, tx_priv->tx_clk_status);
-	if (tx_priv->default_clk_id == clk_src) {
-		dev_dbg(component->dev,
-			"%s: requested clk %d is same as current\n",
-			__func__, clk_src);
-		return 0;
-	} else if (tx_priv->va_swr_clk_cnt != 0 && tx_priv->tx_clk_status) {
-		ret = bolero_clk_rsc_request_clock(tx_priv->dev,
-				tx_priv->default_clk_id,
-				clk_src,
-				true);
-		if (ret) {
-			dev_dbg(component->dev,
-				"%s: request clock %d enable failed\n",
-				__func__, clk_src);
-			goto ret;
-		}
-		ret = bolero_clk_rsc_request_clock(tx_priv->dev,
-				tx_priv->default_clk_id,
-				tx_priv->default_clk_id,
-				false);
-		if (ret) {
-			dev_dbg(component->dev,
-				"%s: request clock  disable failed\n",
-				__func__);
-			bolero_clk_rsc_request_clock(tx_priv->dev,
-				tx_priv->default_clk_id,
-				clk_src,
-				false);
-			goto ret;
-		}
-	} else {
-		ret = -EBUSY;
+	if (tx_priv->swr_ctrl_data) {
+		ret = swrm_wcd_notify(
+			tx_priv->swr_ctrl_data[0].tx_swr_pdev,
+			SWR_REQ_CLK_SWITCH, &clk_src);
 	}
 
-ret:
 	return ret;
 }
 
@@ -3494,7 +3460,6 @@ static int tx_macro_probe(struct platform_device *pdev)
 	tx_macro_init_ops(&ops, tx_io_base);
 	ops.clk_id_req = TX_CORE_CLK;
 	ops.default_clk_id = TX_CORE_CLK;
-	tx_priv->default_clk_id = TX_CORE_CLK;
 	ret = bolero_register_macro(&pdev->dev, TX_MACRO, &ops);
 	if (ret) {
 		dev_err(&pdev->dev,

asoc/codecs/bolero/va-macro.c

@@ -381,6 +381,7 @@ static int va_macro_swr_pwr_event_v2(struct snd_soc_dapm_widget *w,
 	int ret = 0;
 	struct device *va_dev = NULL;
 	struct va_macro_priv *va_priv = NULL;
+	int clk_src = 0;
 
 	if (!va_macro_get_data(component, &va_dev, &va_priv, __func__))
 		return -EINVAL;
@@ -393,31 +394,14 @@ static int va_macro_swr_pwr_event_v2(struct snd_soc_dapm_widget *w,
 
 	switch (event) {
 	case SND_SOC_DAPM_PRE_PMU:
-		if (va_priv->default_clk_id != VA_CORE_CLK) {
-			ret = bolero_clk_rsc_request_clock(va_priv->dev,
-					va_priv->default_clk_id,
-					VA_CORE_CLK,
-					true);
-			if (ret) {
-				dev_dbg(component->dev,
-					"%s: request clock VA_CLK enable failed\n",
-					__func__);
-				break;
-			}
-			ret = bolero_clk_rsc_request_clock(va_priv->dev,
-					va_priv->default_clk_id,
-					TX_CORE_CLK,
-					false);
-			if (ret) {
-				dev_dbg(component->dev,
-					"%s: request clock TX_CLK enable failed\n",
+		if (va_priv->swr_ctrl_data) {
+			clk_src = CLK_SRC_VA_RCG;
+			ret = swrm_wcd_notify(
+				va_priv->swr_ctrl_data[0].va_swr_pdev,
+				SWR_REQ_CLK_SWITCH, &clk_src);
+			if (ret)
+				dev_dbg(va_dev, "%s: clock switch failed\n",
 					__func__);
-				bolero_clk_rsc_request_clock(va_priv->dev,
-					va_priv->default_clk_id,
-					VA_CORE_CLK,
-					false);
-				break;
-			}
 		}
 		msm_cdc_pinctrl_set_wakeup_capable(
 				va_priv->va_swr_gpio_p, false);
@@ -425,31 +409,14 @@ static int va_macro_swr_pwr_event_v2(struct snd_soc_dapm_widget *w,
 	case SND_SOC_DAPM_POST_PMD:
 		msm_cdc_pinctrl_set_wakeup_capable(
 				va_priv->va_swr_gpio_p, true);
-		if (va_priv->default_clk_id == TX_CORE_CLK) {
-			ret = bolero_clk_rsc_request_clock(va_priv->dev,
-					va_priv->default_clk_id,
-					TX_CORE_CLK,
-					true);
-			if (ret) {
-				dev_dbg(component->dev,
-					"%s: request clock TX_CLK disable failed\n",
-					__func__);
-				break;
-			}
-			ret = bolero_clk_rsc_request_clock(va_priv->dev,
-					va_priv->default_clk_id,
-					VA_CORE_CLK,
-					false);
-			if (ret) {
-				dev_dbg(component->dev,
-					"%s: request clock VA_CLK disable failed\n",
+		if (va_priv->swr_ctrl_data) {
+			clk_src = CLK_SRC_TX_RCG;
+			ret = swrm_wcd_notify(
+				va_priv->swr_ctrl_data[0].va_swr_pdev,
+				SWR_REQ_CLK_SWITCH, &clk_src);
+			if (ret)
+				dev_dbg(va_dev, "%s: clock switch failed\n",
 					__func__);
-				bolero_clk_rsc_request_clock(va_priv->dev,
-					TX_CORE_CLK,
-					TX_CORE_CLK,
-					false);
-				break;
-			}
 		}
 		break;
 	default:
@@ -488,11 +455,10 @@ static int va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w,
 					"%s: lpass audio hw enable failed\n",
 					__func__);
 		}
-		if (!ret) {
-			if (bolero_tx_clk_switch(component, VA_CORE_CLK))
+		if (!ret)
+			if (bolero_tx_clk_switch(component, CLK_SRC_VA_RCG))
 				dev_dbg(va_dev, "%s: clock switch failed\n",
 					__func__);
-		}
 		if (va_priv->lpi_enable &&
 			!va_priv->disable_afe_wakeup_event_listener) {
 			bolero_register_event_listener(component, true);
@@ -504,7 +470,7 @@ static int va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w,
 			va_priv->register_event_listener = false;
 			bolero_register_event_listener(component, false);
 		}
-		if (bolero_tx_clk_switch(component, TX_CORE_CLK))
+		if (bolero_tx_clk_switch(component, CLK_SRC_TX_RCG))
 			dev_dbg(va_dev, "%s: clock switch failed\n",__func__);
 		if (va_priv->lpass_audio_hw_vote)
 			digital_cdc_rsc_mgr_hw_vote_disable(
@@ -545,6 +511,7 @@ static int va_macro_mclk_event(struct snd_soc_dapm_widget *w,
 	int ret = 0;
 	struct device *va_dev = NULL;
 	struct va_macro_priv *va_priv = NULL;
+	int clk_src = 0;
 
 	if (!va_macro_get_data(component, &va_dev, &va_priv, __func__))
 		return -EINVAL;
@@ -566,6 +533,22 @@ static int va_macro_mclk_event(struct snd_soc_dapm_widget *w,
 		break;
 	case SND_SOC_DAPM_POST_PMD:
 		if (va_priv->lpi_enable) {
+			if (va_priv->version == BOLERO_VERSION_2_1) {
+				if (va_priv->swr_ctrl_data) {
+					clk_src = CLK_SRC_TX_RCG;
+					ret = swrm_wcd_notify(
+					va_priv->swr_ctrl_data[0].va_swr_pdev,
+					SWR_REQ_CLK_SWITCH, &clk_src);
+					if (ret)
+						dev_dbg(va_dev,
+					"%s: clock switch failed\n",
+						__func__);
+				}
+			} else if (bolero_tx_clk_switch(component,
+					CLK_SRC_TX_RCG)) {
+				dev_dbg(va_dev, "%s: clock switch failed\n",
+					__func__);
+			}
 			va_macro_mclk_enable(va_priv, 0, true);
 		} else {
 			bolero_tx_mclk_enable(component, 0);
@@ -1963,15 +1946,15 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets_v2[] = {
 		VA_MACRO_AIF3_CAP, 0,
 		va_aif3_cap_mixer_v2, ARRAY_SIZE(va_aif3_cap_mixer_v2)),
 
-	SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", 0, SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", -1, SND_SOC_NOPM, 0, 0,
 			      va_macro_swr_pwr_event_v2,
 			      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 
-	SND_SOC_DAPM_SUPPLY_S("VA_TX_SWR_CLK", -1, SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SUPPLY_S("VA_TX_SWR_CLK", 0, SND_SOC_NOPM, 0, 0,
 			      va_macro_tx_swr_clk_event_v2,
 			      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 
-	SND_SOC_DAPM_SUPPLY_S("VA_SWR_CLK", -1, SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SUPPLY_S("VA_SWR_CLK", 0, SND_SOC_NOPM, 0, 0,
 			      va_macro_swr_clk_event_v2,
 			      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 };
@@ -2005,7 +1988,7 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets_v3[] = {
 			   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
 			   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD),
 
-	SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", 0, SND_SOC_NOPM, 0, 0,
+	SND_SOC_DAPM_SUPPLY_S("VA_SWR_PWR", -1, SND_SOC_NOPM, 0, 0,
 			      va_macro_swr_pwr_event,
 			      SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 };