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

Commit 5780614c authored by Vidyakumar Athota's avatar Vidyakumar Athota Committed by Laxminath Kasam
Browse files

ASoC: wcd9335: fix pop during CLS-AB mode 



Pop is observed during starting of the playback in CLS-AB mode.
Fix the pop issue by updating register sequence properly.

Change-Id: Iff17245e8a2b14354cc99150a57394ce81ec29b8
Signed-off-by: default avatarVidyakumar Athota <vathota@codeaurora.org>
parent 7568ce9a

sound/soc/codecs/wcd9335.c

+29 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3659,6 +3659,28 @@ static void tasha_codec_hph_post_pa_config(struct tasha_priv *tasha, 
	}

}



static void tasha_codec_override(struct snd_soc_codec *codec,

				 int mode,

				 int event)

{

	if (mode == CLS_AB) {

		switch (event) {

		case SND_SOC_DAPM_POST_PMU:

			if (!(snd_soc_read(codec,

					WCD9335_CDC_RX2_RX_PATH_CTL) & 0x10) &&

				(!(snd_soc_read(codec,

					WCD9335_CDC_RX1_RX_PATH_CTL) & 0x10)))

				snd_soc_update_bits(codec,

					WCD9XXX_A_ANA_RX_SUPPLIES, 0x02, 0x02);

		break;

		case SND_SOC_DAPM_POST_PMD:

			snd_soc_update_bits(codec,

				WCD9XXX_A_ANA_RX_SUPPLIES, 0x02, 0x00);

		break;

		}

	}

}



static int tasha_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w,

				      struct snd_kcontrol *kcontrol,

				      int event)
@@ -3692,6 +3714,7 @@ static int tasha_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec,

					    WCD9335_CDC_RX2_RX_PATH_MIX_CTL,

					    0x10, 0x00);

		tasha_codec_override(codec, hph_mode, event);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		blocking_notifier_call_chain(&tasha->notifier,
@@ -3704,6 +3727,7 @@ static int tasha_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w, 
		 * HW requirement

		 */

		usleep_range(5000, 5500);

		tasha_codec_override(codec, hph_mode, event);

		blocking_notifier_call_chain(&tasha->notifier,

					WCD_EVENT_POST_HPHR_PA_OFF,

					&tasha->mbhc);
@@ -3753,6 +3777,7 @@ static int tasha_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec,

					    WCD9335_CDC_RX1_RX_PATH_MIX_CTL,

					    0x10, 0x00);

		tasha_codec_override(codec, hph_mode, event);

		break;

	case SND_SOC_DAPM_PRE_PMD:

		blocking_notifier_call_chain(&tasha->notifier,
@@ -3765,6 +3790,7 @@ static int tasha_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w, 
		 * HW requirement

		 */

		usleep_range(5000, 5500);

		tasha_codec_override(codec, hph_mode, event);

		blocking_notifier_call_chain(&tasha->notifier,

					WCD_EVENT_POST_HPHL_PA_OFF,

					&tasha->mbhc);
@@ -3825,12 +3851,14 @@ static int tasha_codec_enable_lineout_pa(struct snd_soc_dapm_widget *w, 
			snd_soc_update_bits(codec,

					    lineout_mix_vol_reg,

					    0x10, 0x00);

		tasha_codec_override(codec, CLS_AB, event);

		break;

	case SND_SOC_DAPM_POST_PMD:

		/* 5ms sleep is required after PA is disabled as per

		 * HW requirement

		 */

		usleep_range(5000, 5500);

		tasha_codec_override(codec, CLS_AB, event);

		if (!(strcmp(w->name, "ANC LINEOUT1 PA")) ||

			!(strcmp(w->name, "ANC LINEOUT2 PA"))) {

			ret = tasha_codec_enable_anc(w, kcontrol, event);

sound/soc/codecs/wcd9xxx-common-v2.c

+3 −7
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -348,10 +348,6 @@ static void wcd_clsh_set_flyback_current(struct snd_soc_codec *codec, int mode) 
static void wcd_clsh_set_buck_regulator_mode(struct snd_soc_codec *codec,

					     int mode)

{

	if (mode == CLS_AB)

		snd_soc_update_bits(codec, WCD9XXX_A_ANA_RX_SUPPLIES,

				    0x02, 0x02);

	else

	snd_soc_update_bits(codec, WCD9XXX_A_ANA_RX_SUPPLIES,

			    0x02, 0x00);

}