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

Commit a8a476a7 authored by Simmi Pateriya's avatar Simmi Pateriya Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm8x16-wcd: fix headset playback issue on cajon 2.0 



On pmic/cajon 2.0, headset record is failing due to mux setting is
not taking effect. As HPH MUX is not mapped to any register from
codec hardware, it needs to be declared as SND_SOC_NOPM mux.

Change-Id: Ice8e749d9861bf6eeb020818ad30f55e7f62e25b
Signed-off-by: default avatarSimmi Pateriya <simmip@codeaurora.org>
parent f5d3db32

sound/soc/codecs/msm8x16-wcd.c

+8 −5
Original line number Diff line number Diff line
@@ -2459,13 +2459,16 @@ static const char * const iir_inp1_text[] = { 
};



static const struct soc_enum adc2_enum =

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(adc2_mux_text), adc2_mux_text);

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0,

		ARRAY_SIZE(adc2_mux_text), adc2_mux_text);



static const struct soc_enum ext_spk_enum =

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(ext_spk_text), ext_spk_text);

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0,

		ARRAY_SIZE(ext_spk_text), ext_spk_text);



static const struct soc_enum wsa_spk_enum =

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(wsa_spk_text), wsa_spk_text);

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0,

		ARRAY_SIZE(wsa_spk_text), wsa_spk_text);



/* RX1 MIX1 */

static const struct soc_enum rx_mix1_inp1_chain_enum =
@@ -2700,7 +2703,7 @@ static const char * const ear_text[] = { 
};



static const struct soc_enum ear_enum =

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(ear_text), ear_text);

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(ear_text), ear_text);



static const struct snd_kcontrol_new ear_pa_mux[] = {

	SOC_DAPM_ENUM("EAR_S", ear_enum)
@@ -2718,7 +2721,7 @@ static const char * const hph_text[] = { 
};



static const struct soc_enum hph_enum =

	SOC_ENUM_SINGLE(0, 0, ARRAY_SIZE(hph_text), hph_text);

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(hph_text), hph_text);



static const struct snd_kcontrol_new hphl_mux[] = {

	SOC_DAPM_ENUM("HPHL", hph_enum)