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

This project is archived. Its data is read-only. This project is read-only.

Commit 4f7e62e4 authored Mar 22, 2014 by Sudheer Papothi

ASoC: wcd9xxx: Change in sequence of HPH Rx path



Change HPH Rx path sequence to enable Rx clock and reset Rx interpolator
path before HPH DACs enable to avoid pop during bringup of device path.

CRs-Fixed: 616383
Change-Id: If2beefc300e11908e87c90f0ab0fab0bfaf968b1
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>

parent 63875384

sound/soc/codecs/wcd9320.c

+33 −8

Original line number	Diff line number	Diff line
		@@ -1131,6 +1131,24 @@ static const struct soc_enum class_h_dsm_enum =
		static const struct snd_kcontrol_new class_h_dsm_mux =
		SOC_DAPM_ENUM("CLASS_H_DSM MUX Mux", class_h_dsm_enum);

		static const char * const rx1_interpolator_text[] = {
		"ZERO", "RX1 MIX2"
		};
		static const struct soc_enum rx1_interpolator_enum =
		SOC_ENUM_SINGLE(TAIKO_A_CDC_CLK_RX_B1_CTL, 0, 2, rx1_interpolator_text);

		static const struct snd_kcontrol_new rx1_interpolator =
		SOC_DAPM_ENUM("RX1 INTERP Mux", rx1_interpolator_enum);

		static const char * const rx2_interpolator_text[] = {
		"ZERO", "RX2 MIX2"
		};
		static const struct soc_enum rx2_interpolator_enum =
		SOC_ENUM_SINGLE(TAIKO_A_CDC_CLK_RX_B1_CTL, 1, 2, rx2_interpolator_text);

		static const struct snd_kcontrol_new rx2_interpolator =
		SOC_DAPM_ENUM("RX2 INTERP Mux", rx2_interpolator_enum);

		static const char *const taiko_conn_mad_text[] = {
		"ADC_MB", "ADC1", "ADC2", "ADC3", "ADC4", "ADC5", "ADC6", "NOTUSED1",
		"DMIC1", "DMIC2", "DMIC3", "DMIC4", "DMIC5", "DMIC6", "NOTUSED2",
		@@ -3287,6 +3305,7 @@ static int taiko_hphl_dac_event(struct snd_soc_dapm_widget *w,
		case SND_SOC_DAPM_POST_PMD:
		snd_soc_update_bits(codec, TAIKO_A_CDC_CLK_RDAC_CLK_EN_CTL,
		0x02, 0x00);
		break;
		}
		return 0;
		}
		@@ -3789,8 +3808,11 @@ static const struct snd_soc_dapm_route audio_map[] = {

		{"CLASS_H_DSM MUX", "DSM_HPHL_RX1", "RX1 CHAIN"},

		{"RX1 CHAIN", NULL, "RX1 MIX2"},
		{"RX2 CHAIN", NULL, "RX2 MIX2"},
		{"RX1 INTERP", NULL, "RX1 MIX2"},
		{"RX1 CHAIN", NULL, "RX1 INTERP"},
		{"RX2 INTERP", NULL, "RX2 MIX2"},
		{"RX2 CHAIN", NULL, "RX2 INTERP"},

		{"RX1 MIX2", NULL, "ANC1 MUX"},
		{"RX2 MIX2", NULL, "ANC2 MUX"},

		@@ -5539,12 +5561,9 @@ static const struct snd_soc_dapm_widget taiko_dapm_widgets[] = {
		SND_SOC_DAPM_MIXER("RX2 MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),
		SND_SOC_DAPM_MIXER("RX7 MIX1", SND_SOC_NOPM, 0, 0, NULL, 0),

		SND_SOC_DAPM_MIXER_E("RX1 MIX2", TAIKO_A_CDC_CLK_RX_B1_CTL, 0, 0, NULL,
		0, taiko_codec_enable_interpolator, SND_SOC_DAPM_PRE_PMU \|
		SND_SOC_DAPM_POST_PMU),
		SND_SOC_DAPM_MIXER_E("RX2 MIX2", TAIKO_A_CDC_CLK_RX_B1_CTL, 1, 0, NULL,
		0, taiko_codec_enable_interpolator, SND_SOC_DAPM_PRE_PMU \|
		SND_SOC_DAPM_POST_PMU),
		SND_SOC_DAPM_MIXER("RX1 MIX2", SND_SOC_NOPM, 0, 0, NULL, 0),
		SND_SOC_DAPM_MIXER("RX2 MIX2", SND_SOC_NOPM, 0, 0, NULL, 0),

		SND_SOC_DAPM_MIXER_E("RX3 MIX1", TAIKO_A_CDC_CLK_RX_B1_CTL, 2, 0, NULL,
		0, taiko_codec_enable_interpolator, SND_SOC_DAPM_PRE_PMU \|
		SND_SOC_DAPM_POST_PMU),
		@@ -5561,6 +5580,12 @@ static const struct snd_soc_dapm_widget taiko_dapm_widgets[] = {
		0, taiko_codec_enable_interpolator, SND_SOC_DAPM_PRE_PMU \|
		SND_SOC_DAPM_POST_PMU),

		SND_SOC_DAPM_MUX_E("RX1 INTERP", TAIKO_A_CDC_CLK_RX_B1_CTL, 0, 0,
		&rx1_interpolator, taiko_codec_enable_interpolator,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU),
		SND_SOC_DAPM_MUX_E("RX2 INTERP", TAIKO_A_CDC_CLK_RX_B1_CTL, 1, 0,
		&rx2_interpolator, taiko_codec_enable_interpolator,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU),

		SND_SOC_DAPM_MIXER("RX1 CHAIN", TAIKO_A_CDC_RX1_B6_CTL, 5, 0, NULL, 0),
		SND_SOC_DAPM_MIXER("RX2 CHAIN", TAIKO_A_CDC_RX2_B6_CTL, 5, 0, NULL, 0),