Merge "Revert "soc: mstr-ctrl: Retain Audio_HM voting until suspend"" (d14744d9) · Commits · e / devices / android_kernel_oneplus_sm7250

asoc/codecs/bolero/bolero-cdc.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1090,7 +1090,7 @@ EXPORT_SYMBOL(bolero_tx_mclk_enable);
		* Returns 0 on success or -EINVAL on error.
		*/
		int bolero_register_event_listener(struct snd_soc_component *component,
		bool enable, bool is_dmic_sva)
		bool enable)
		{
		struct bolero_priv *priv = NULL;
		int ret = 0;
		@@ -1109,8 +1109,7 @@ int bolero_register_event_listener(struct snd_soc_component *component,

		if (priv->macro_params[TX_MACRO].reg_evt_listener)
		ret = priv->macro_params[TX_MACRO].reg_evt_listener(component,
		enable,
		is_dmic_sva);
		enable);

		return ret;
		}

asoc/codecs/bolero/bolero-cdc.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -89,8 +89,7 @@ struct macro_ops {
		u32 size, void *data);
		int (clk_div_get)(struct snd_soc_component component);
		int (clk_switch)(struct snd_soc_component component, int clk_src);
		int (reg_evt_listener)(struct snd_soc_component component,
		bool en, bool is_dmic_sva);
		int (reg_evt_listener)(struct snd_soc_component component, bool en);
		int (clk_enable)(struct snd_soc_component c, bool en);
		char __iomem *io_base;
		u16 clk_id_req;
		@@ -117,7 +116,7 @@ int bolero_runtime_suspend(struct device *dev);
		int bolero_set_port_map(struct snd_soc_component component, u32 size, void data);
		int bolero_tx_clk_switch(struct snd_soc_component *component, int clk_src);
		int bolero_register_event_listener(struct snd_soc_component *component,
		bool enable, bool is_dmic_sva);
		bool enable);
		void bolero_wsa_pa_on(struct device *dev, bool adie_lb);
		bool bolero_check_core_votes(struct device *dev);
		int bolero_tx_mclk_enable(struct snd_soc_component *c, bool enable);
		@@ -191,7 +190,7 @@ static inline int bolero_tx_clk_switch(struct snd_soc_component *component,

		static inline int bolero_register_event_listener(
		struct snd_soc_component *component,
		bool enable, bool is_dmic_sva)
		bool enable)
		{
		return 0;
		}

asoc/codecs/bolero/rx-macro.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -378,7 +378,6 @@ struct rx_swr_ctrl_platform_data {
		void *data),
		void *swrm_handle,
		int action);
		int (pinctrl_setup)(void handle, bool enable);
		};

		enum {
		@@ -4071,7 +4070,6 @@ static int rx_macro_probe(struct platform_device *pdev)
		rx_priv->swr_plat_data.clk = rx_swrm_clock;
		rx_priv->swr_plat_data.core_vote = rx_macro_core_vote;
		rx_priv->swr_plat_data.handle_irq = NULL;
		rx_priv->swr_plat_data.pinctrl_setup = NULL;

		ret = of_property_read_u8_array(pdev->dev.of_node,
		"qcom,rx-bcl-pmic-params", bcl_pmic_params,

asoc/codecs/bolero/tx-macro.c

+5 −27

Original line number	Diff line number	Diff line
		@@ -81,7 +81,6 @@ struct tx_macro_swr_ctrl_platform_data {
		void *data),
		void *swrm_handle,
		int action);
		int (pinctrl_setup)(void handle, bool enable);
		};

		enum {
		@@ -2388,30 +2387,12 @@ static const struct snd_kcontrol_new tx_macro_snd_controls[] = {
		tx_macro_get_bcs, tx_macro_set_bcs),
		};

		static int tx_macro_pinctrl_setup(void *handle, bool enable)
		{
		struct tx_macro_priv tx_priv = (struct tx_macro_priv ) handle;

		if (tx_priv == NULL) {
		pr_err("%s: tx priv data is NULL\n", __func__);
		return -EINVAL;
		}
		if (enable)
		msm_cdc_pinctrl_set_wakeup_capable(
		tx_priv->tx_swr_gpio_p, true);
		else
		msm_cdc_pinctrl_set_wakeup_capable(
		tx_priv->tx_swr_gpio_p, false);
		return 0;
		}

		static int tx_macro_register_event_listener(struct snd_soc_component *component,
		bool enable, bool is_dmic_sva)
		bool enable)
		{
		struct device *tx_dev = NULL;
		struct tx_macro_priv *tx_priv = NULL;
		int ret = 0;
		u32 dmic_sva = is_dmic_sva;

		if (!component)
		return -EINVAL;
		@@ -2433,17 +2414,15 @@ static int tx_macro_register_event_listener(struct snd_soc_component *component,
		if (enable) {
		ret = swrm_wcd_notify(
		tx_priv->swr_ctrl_data[0].tx_swr_pdev,
		SWR_REGISTER_WAKEUP, &dmic_sva);
		SWR_REGISTER_WAKEUP, NULL);
		msm_cdc_pinctrl_set_wakeup_capable(
		tx_priv->tx_swr_gpio_p, false);
		} else {
		/* while teardown we can reset the flag */
		dmic_sva = 0;
		msm_cdc_pinctrl_set_wakeup_capable(
		tx_priv->tx_swr_gpio_p, true);
		ret = swrm_wcd_notify(
		tx_priv->swr_ctrl_data[0].tx_swr_pdev,
		SWR_DEREGISTER_WAKEUP, &dmic_sva);
		SWR_DEREGISTER_WAKEUP, NULL);
		}
		}

		@@ -3252,7 +3231,6 @@ static int tx_macro_probe(struct platform_device *pdev)
		tx_priv->swr_plat_data.clk = tx_macro_swrm_clock;
		tx_priv->swr_plat_data.core_vote = tx_macro_core_vote;
		tx_priv->swr_plat_data.handle_irq = NULL;
		tx_priv->swr_plat_data.pinctrl_setup = tx_macro_pinctrl_setup;
		mutex_init(&tx_priv->swr_clk_lock);
		}
		tx_priv->is_used_tx_swr_gpio = is_used_tx_swr_gpio;

asoc/codecs/bolero/va-macro.c

+2 −69

Original line number	Diff line number	Diff line
		@@ -130,7 +130,6 @@ struct va_macro_swr_ctrl_platform_data {
		void *data),
		void *swrm_handle,
		int action);
		int (pinctrl_setup)(void handle, bool enable);
		};

		struct va_macro_priv {
		@@ -460,14 +459,14 @@ static int va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w,
		dev_dbg(va_dev, "%s: clock switch failed\n",
		__func__);
		if (va_priv->lpi_enable) {
		bolero_register_event_listener(component, true, false);
		bolero_register_event_listener(component, true);
		va_priv->register_event_listener = true;
		}
		break;
		case SND_SOC_DAPM_POST_PMD:
		if (va_priv->register_event_listener) {
		va_priv->register_event_listener = false;
		bolero_register_event_listener(component, false, false);
		bolero_register_event_listener(component, false);
		}
		if (bolero_tx_clk_switch(component, CLK_SRC_TX_RCG))
		dev_dbg(va_dev, "%s: clock switch failed\n",__func__);
		@@ -483,45 +482,6 @@ static int va_macro_swr_pwr_event(struct snd_soc_dapm_widget *w,
		return ret;
		}

		static int va_macro_swr_intr_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		struct snd_soc_component *component =
		snd_soc_dapm_to_component(w->dapm);
		int ret = 0;
		struct device *va_dev = NULL;
		struct va_macro_priv *va_priv = NULL;

		if (!va_macro_get_data(component, &va_dev, &va_priv, __func__))
		return -EINVAL;

		dev_dbg(va_dev, "%s: event = %d, lpi_enable = %d\n",
		__func__, event, va_priv->lpi_enable);

		if (!va_priv->lpi_enable)
		return ret;

		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		if (va_priv->lpi_enable) {
		bolero_register_event_listener(component, true, true);
		va_priv->register_event_listener = true;
		}
		break;
		case SND_SOC_DAPM_POST_PMD:
		if (va_priv->register_event_listener) {
		va_priv->register_event_listener = false;
		bolero_register_event_listener(component, false, true);
		}
		break;
		default:
		dev_err(va_priv->dev,
		"%s: invalid DAPM event %d\n", __func__, event);
		ret = -EINVAL;
		}
		return ret;
		}

		static int va_macro_tx_swr_clk_event_v2(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		@@ -2004,10 +1964,6 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets_v3[] = {
		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),

		SND_SOC_DAPM_SUPPLY_S("VA_SWR_INTR", 0, SND_SOC_NOPM, 0, 0,
		va_macro_swr_intr_event,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
		};

		static const struct snd_soc_dapm_widget va_macro_dapm_widgets[] = {
		@@ -2152,10 +2108,6 @@ static const struct snd_soc_dapm_widget va_macro_dapm_widgets[] = {
		SND_SOC_DAPM_SUPPLY_S("VA_MCLK", -1, SND_SOC_NOPM, 0, 0,
		va_macro_mclk_event,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),

		SND_SOC_DAPM_SUPPLY_S("VA_SWR_INTR", 0, SND_SOC_NOPM, 0, 0,
		va_macro_swr_intr_event,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMD),
		};

		static const struct snd_soc_dapm_widget va_macro_wod_dapm_widgets[] = {
		@@ -2302,15 +2254,6 @@ static const struct snd_soc_dapm_route va_audio_map_v3[] = {
		{"VA SMIC MUX3", "SWR_MIC9", "VA SWR_MIC9"},
		{"VA SMIC MUX3", "SWR_MIC10", "VA SWR_MIC10"},
		{"VA SMIC MUX3", "SWR_MIC11", "VA SWR_MIC11"},

		{"VA DMIC0", NULL, "VA_SWR_INTR"},
		{"VA DMIC1", NULL, "VA_SWR_INTR"},
		{"VA DMIC2", NULL, "VA_SWR_INTR"},
		{"VA DMIC3", NULL, "VA_SWR_INTR"},
		{"VA DMIC4", NULL, "VA_SWR_INTR"},
		{"VA DMIC5", NULL, "VA_SWR_INTR"},
		{"VA DMIC6", NULL, "VA_SWR_INTR"},
		{"VA DMIC7", NULL, "VA_SWR_INTR"},
		};

		static const struct snd_soc_dapm_route va_audio_map_v2[] = {
		@@ -2547,15 +2490,6 @@ static const struct snd_soc_dapm_route va_audio_map[] = {
		{"VA SMIC MUX7", "SWR_DMIC6", "VA SWR_MIC6"},
		{"VA SMIC MUX7", "SWR_DMIC7", "VA SWR_MIC7"},

		{"VA DMIC0", NULL, "VA_SWR_INTR"},
		{"VA DMIC1", NULL, "VA_SWR_INTR"},
		{"VA DMIC2", NULL, "VA_SWR_INTR"},
		{"VA DMIC3", NULL, "VA_SWR_INTR"},
		{"VA DMIC4", NULL, "VA_SWR_INTR"},
		{"VA DMIC5", NULL, "VA_SWR_INTR"},
		{"VA DMIC6", NULL, "VA_SWR_INTR"},
		{"VA DMIC7", NULL, "VA_SWR_INTR"},

		{"VA SWR_ADC0", NULL, "VA_SWR_PWR"},
		{"VA SWR_ADC1", NULL, "VA_SWR_PWR"},
		{"VA SWR_ADC2", NULL, "VA_SWR_PWR"},
		@@ -3216,7 +3150,6 @@ static int va_macro_probe(struct platform_device *pdev)
		va_priv->swr_plat_data.clk = va_macro_swrm_clock;
		va_priv->swr_plat_data.core_vote = va_macro_core_vote;
		va_priv->swr_plat_data.handle_irq = NULL;
		va_priv->swr_plat_data.pinctrl_setup = NULL;
		mutex_init(&va_priv->swr_clk_lock);
		}
		va_priv->is_used_va_swr_gpio = is_used_va_swr_gpio;