Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e2e7014 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 64154bc5 on remote branch 

Change-Id: I2222f66428b959c7880e68de32cae551ed5732a1
parents 8777b754 64154bc5

asoc/bengal.c

+154 −91
Original line number Diff line number Diff line
@@ -2976,6 +2976,32 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = { 
	SOC_ENUM_EXT("USB_AUDIO_TX SampleRate", usb_tx_sample_rate,

			usb_audio_tx_sample_rate_get,

			usb_audio_tx_sample_rate_put),

	SOC_ENUM_EXT("USB_AUDIO_RX Format", usb_rx_format,

			usb_audio_rx_format_get, usb_audio_rx_format_put),

	SOC_ENUM_EXT("USB_AUDIO_TX Format", usb_tx_format,

			usb_audio_tx_format_get, usb_audio_tx_format_put),

	SOC_ENUM_EXT("USB_AUDIO_RX Channels", usb_rx_chs,

			usb_audio_rx_ch_get, usb_audio_rx_ch_put),

	SOC_ENUM_EXT("USB_AUDIO_TX Channels", usb_tx_chs,

			usb_audio_tx_ch_get, usb_audio_tx_ch_put),

	SOC_ENUM_EXT("PROXY_RX Channels", proxy_rx_chs,

			proxy_rx_ch_get, proxy_rx_ch_put),

	SOC_ENUM_EXT("BT SampleRate", bt_sample_rate,

			msm_bt_sample_rate_get,

			msm_bt_sample_rate_put),

	SOC_ENUM_EXT("BT SampleRate RX", bt_sample_rate_rx,

			msm_bt_sample_rate_rx_get,

			msm_bt_sample_rate_rx_put),

	SOC_ENUM_EXT("BT SampleRate TX", bt_sample_rate_tx,

			msm_bt_sample_rate_tx_get,

			msm_bt_sample_rate_tx_put),

	SOC_ENUM_EXT("AFE_LOOPBACK_TX Channels", afe_loopback_tx_chs,

			afe_loopback_tx_ch_get, afe_loopback_tx_ch_put),

	SOC_ENUM_EXT("VI_FEED_TX Channels", vi_feed_tx_chs,

			msm_vi_feed_tx_ch_get, msm_vi_feed_tx_ch_put),

};



static const struct snd_kcontrol_new msm_tdm_snd_controls[] = {

	SOC_ENUM_EXT("PRI_TDM_RX_0 SampleRate", tdm_rx_sample_rate,

			tdm_rx_sample_rate_get,

			tdm_rx_sample_rate_put),
@@ -3000,6 +3026,57 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = { 
	SOC_ENUM_EXT("QUAT_TDM_TX_0 SampleRate", tdm_tx_sample_rate,

			tdm_tx_sample_rate_get,

			tdm_tx_sample_rate_put),

	SOC_ENUM_EXT("PRI_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("SEC_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("TERT_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("QUAT_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("PRI_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("SEC_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("TERT_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("QUAT_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("PRI_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("SEC_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("TERT_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("QUAT_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("PRI_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("SEC_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("TERT_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("QUAT_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

};



static const struct snd_kcontrol_new msm_auxpcm_snd_controls[] = {

	SOC_ENUM_EXT("PRIM_AUX_PCM_RX SampleRate", prim_aux_pcm_rx_sample_rate,

			aux_pcm_rx_sample_rate_get,

			aux_pcm_rx_sample_rate_put),
@@ -3024,6 +3101,25 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = { 
	SOC_ENUM_EXT("QUAT_AUX_PCM_TX SampleRate", quat_aux_pcm_tx_sample_rate,

			aux_pcm_tx_sample_rate_get,

			aux_pcm_tx_sample_rate_put),

	SOC_ENUM_EXT("PRIM_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("SEC_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("TERT_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("QUAT_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("PRIM_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("SEC_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("TERT_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("QUAT_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

};



static const struct snd_kcontrol_new msm_mi2s_snd_controls[] = {

	SOC_ENUM_EXT("PRIM_MI2S_RX SampleRate", prim_mi2s_rx_sample_rate,

			mi2s_rx_sample_rate_get,

			mi2s_rx_sample_rate_put),
@@ -3035,9 +3131,6 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = { 
			mi2s_rx_sample_rate_put),

	SOC_ENUM_EXT("QUAT_MI2S_RX SampleRate", quat_mi2s_rx_sample_rate,

			mi2s_rx_sample_rate_get,

			mi2s_rx_sample_rate_put),

	SOC_ENUM_EXT("PRIM_MI2S_TX SampleRate", prim_mi2s_tx_sample_rate,

			mi2s_tx_sample_rate_get,

			mi2s_tx_sample_rate_put),

	SOC_ENUM_EXT("SEC_MI2S_TX SampleRate", sec_mi2s_tx_sample_rate,

			mi2s_tx_sample_rate_get,
@@ -3048,50 +3141,6 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = { 
	SOC_ENUM_EXT("QUAT_MI2S_TX SampleRate", quat_mi2s_tx_sample_rate,

			mi2s_tx_sample_rate_get,

			mi2s_tx_sample_rate_put),

	SOC_ENUM_EXT("USB_AUDIO_RX Format", usb_rx_format,

			usb_audio_rx_format_get, usb_audio_rx_format_put),

	SOC_ENUM_EXT("USB_AUDIO_TX Format", usb_tx_format,

			usb_audio_tx_format_get, usb_audio_tx_format_put),

	SOC_ENUM_EXT("PRI_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("SEC_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("TERT_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("QUAT_TDM_RX_0 Format", tdm_rx_format,

			tdm_rx_format_get,

			tdm_rx_format_put),

	SOC_ENUM_EXT("PRI_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("SEC_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("TERT_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("QUAT_TDM_TX_0 Format", tdm_tx_format,

			tdm_tx_format_get,

			tdm_tx_format_put),

	SOC_ENUM_EXT("PRIM_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("SEC_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("TERT_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("QUAT_AUX_PCM_RX Format", aux_pcm_rx_format,

			msm_aux_pcm_rx_format_get, msm_aux_pcm_rx_format_put),

	SOC_ENUM_EXT("PRIM_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("SEC_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("TERT_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("QUAT_AUX_PCM_TX Format", aux_pcm_tx_format,

			msm_aux_pcm_tx_format_get, msm_aux_pcm_tx_format_put),

	SOC_ENUM_EXT("PRIM_MI2S_RX Format", mi2s_rx_format,

			msm_mi2s_rx_format_get, msm_mi2s_rx_format_put),

	SOC_ENUM_EXT("SEC_MI2S_RX Format", mi2s_rx_format,
@@ -3108,36 +3157,6 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = { 
			msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),

	SOC_ENUM_EXT("QUAT_MI2S_TX Format", mi2s_tx_format,

			msm_mi2s_tx_format_get, msm_mi2s_tx_format_put),

	SOC_ENUM_EXT("USB_AUDIO_RX Channels", usb_rx_chs,

			usb_audio_rx_ch_get, usb_audio_rx_ch_put),

	SOC_ENUM_EXT("USB_AUDIO_TX Channels", usb_tx_chs,

			usb_audio_tx_ch_get, usb_audio_tx_ch_put),

	SOC_ENUM_EXT("PROXY_RX Channels", proxy_rx_chs,

			proxy_rx_ch_get, proxy_rx_ch_put),

	SOC_ENUM_EXT("PRI_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("SEC_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("TERT_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("QUAT_TDM_RX_0 Channels", tdm_rx_chs,

			tdm_rx_ch_get,

			tdm_rx_ch_put),

	SOC_ENUM_EXT("PRI_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("SEC_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("TERT_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("QUAT_TDM_TX_0 Channels", tdm_tx_chs,

			tdm_tx_ch_get,

			tdm_tx_ch_put),

	SOC_ENUM_EXT("PRIM_MI2S_RX Channels", prim_mi2s_rx_chs,

			msm_mi2s_rx_ch_get, msm_mi2s_rx_ch_put),

	SOC_ENUM_EXT("SEC_MI2S_RX Channels", sec_mi2s_rx_chs,
@@ -3154,19 +3173,6 @@ static const struct snd_kcontrol_new msm_common_snd_controls[] = { 
			msm_mi2s_tx_ch_get, msm_mi2s_tx_ch_put),

	SOC_ENUM_EXT("QUAT_MI2S_TX Channels", quat_mi2s_tx_chs,

			msm_mi2s_tx_ch_get, msm_mi2s_tx_ch_put),

	SOC_ENUM_EXT("BT SampleRate", bt_sample_rate,

			msm_bt_sample_rate_get,

			msm_bt_sample_rate_put),

	SOC_ENUM_EXT("BT SampleRate RX", bt_sample_rate_rx,

			msm_bt_sample_rate_rx_get,

			msm_bt_sample_rate_rx_put),

	SOC_ENUM_EXT("BT SampleRate TX", bt_sample_rate_tx,

			msm_bt_sample_rate_tx_get,

			msm_bt_sample_rate_tx_put),

	SOC_ENUM_EXT("AFE_LOOPBACK_TX Channels", afe_loopback_tx_chs,

			afe_loopback_tx_ch_get, afe_loopback_tx_ch_put),

	SOC_ENUM_EXT("VI_FEED_TX Channels", vi_feed_tx_chs,

			msm_vi_feed_tx_ch_get, msm_vi_feed_tx_ch_put),

};



static const struct snd_kcontrol_new msm_snd_controls[] = {
@@ -4214,6 +4220,45 @@ static int msm_wcn_init(struct snd_soc_pcm_runtime *rtd) 
					   tx_ch, ARRAY_SIZE(rx_ch), rx_ch);

}



#ifndef CONFIG_TDM_DISABLE

static void msm_add_tdm_snd_controls(struct snd_soc_component *component)

{

	snd_soc_add_component_controls(component, msm_tdm_snd_controls,

				ARRAY_SIZE(msm_tdm_snd_controls));

}

#else

static void msm_add_tdm_snd_controls(struct snd_soc_component *component)

{

	return;

}

#endif



#ifndef CONFIG_MI2S_DISABLE

static void msm_add_mi2s_snd_controls(struct snd_soc_component *component)

{

	snd_soc_add_component_controls(component, msm_mi2s_snd_controls,

				ARRAY_SIZE(msm_mi2s_snd_controls));

}

#else

static void msm_add_mi2s_snd_controls(struct snd_soc_component *component)

{

	return;

}

#endif



#ifndef CONFIG_AUXPCM_DISABLE

static void msm_add_auxpcm_snd_controls(struct snd_soc_component *component)

{

	snd_soc_add_component_controls(component, msm_auxpcm_snd_controls,

				ARRAY_SIZE(msm_auxpcm_snd_controls));

}

#else

static void msm_add_auxpcm_snd_controls(struct snd_soc_component *component)

{

	return;

}

#endif



static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd)

{

	int ret = -EINVAL;
@@ -4251,6 +4296,10 @@ static int msm_int_audrx_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	msm_add_tdm_snd_controls(component);

	msm_add_mi2s_snd_controls(component);

	msm_add_auxpcm_snd_controls(component);



	snd_soc_dapm_new_controls(dapm, msm_int_dapm_widgets,

				ARRAY_SIZE(msm_int_dapm_widgets));
@@ -5149,6 +5198,9 @@ static struct snd_soc_dai_link msm_common_be_dai_links[] = { 
		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm_tdm_be_dai_links[] = {

	{

		.name = LPASS_BE_PRI_TDM_RX_0,

		.stream_name = "Primary TDM0 Playback",
@@ -5728,7 +5780,8 @@ static struct snd_soc_dai_link msm_bengal_dai_links[ 
			ARRAY_SIZE(msm_rx_tx_cdc_dma_be_dai_links) +

			ARRAY_SIZE(msm_va_cdc_dma_be_dai_links) +

			ARRAY_SIZE(msm_afe_rxtx_lb_be_dai_link) +

			ARRAY_SIZE(msm_wcn_btfm_be_dai_links)];

			ARRAY_SIZE(msm_wcn_btfm_be_dai_links) +

			ARRAY_SIZE(msm_tdm_be_dai_links)];



static int msm_populate_dai_link_component_of_node(

					struct snd_soc_card *card)
@@ -6040,6 +6093,16 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 
				ARRAY_SIZE(msm_afe_rxtx_lb_be_dai_link);

		}



		rc = of_property_read_u32(dev->of_node, "qcom,tdm-audio-intf",

				&val);

		if (!rc && val) {

			memcpy(msm_bengal_dai_links + total_links,

				msm_tdm_be_dai_links,

				sizeof(msm_tdm_be_dai_links));

			total_links +=

				ARRAY_SIZE(msm_tdm_be_dai_links);

		}



		rc = of_property_read_u32(dev->of_node, "qcom,wcn-btfm",

					  &wcn_btfm_intf);

		if (rc) {

asoc/codecs/bolero/bolero-cdc.c

+3 −2
Original line number Diff line number Diff line
@@ -1078,7 +1078,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 enable, bool is_dmic_sva)

{

	struct bolero_priv *priv = NULL;

	int ret = 0;
@@ -1097,7 +1097,8 @@ 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);

								    enable,

								    is_dmic_sva);



	return ret;

}

asoc/codecs/bolero/bolero-cdc.h

+4 −3
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ 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);

	int (*reg_evt_listener)(struct snd_soc_component *component,

			bool en, bool is_dmic_sva);

	int (*clk_enable)(struct snd_soc_component *c, bool en);

	char __iomem *io_base;

	u16 clk_id_req;
@@ -115,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 enable, bool is_dmic_sva);

void bolero_wsa_pa_on(struct device *dev);

bool bolero_check_core_votes(struct device *dev);

int bolero_tx_mclk_enable(struct snd_soc_component *c, bool enable);
@@ -189,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 enable, bool is_dmic_sva)

{

	return 0;

}

asoc/codecs/bolero/rx-macro.c

+2 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ struct rx_swr_ctrl_platform_data { 
							  void *data),

			  void *swrm_handle,

			  int action);

	int (*pinctrl_setup)(void *handle, bool enable);

};



enum {
@@ -4068,6 +4069,7 @@ 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

+27 −5
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ struct tx_macro_swr_ctrl_platform_data { 
							  void *data),

			  void *swrm_handle,

			  int action);

	int (*pinctrl_setup)(void *handle, bool enable);

};



enum {
@@ -2384,12 +2385,30 @@ 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 enable, bool is_dmic_sva)

{

	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;
@@ -2411,15 +2430,17 @@ 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, NULL);

				SWR_REGISTER_WAKEUP, &dmic_sva);

			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, NULL);

				SWR_DEREGISTER_WAKEUP, &dmic_sva);

		}

	}
@@ -3228,6 +3249,7 @@ 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;