Unverified Commit 6fa849e4 authored by Stuart Henderson's avatar Stuart Henderson Committed by Mark Brown
Browse files

ASoC: wm8962: Enable both SPKOUTR_ENA and SPKOUTL_ENA in mono mode 



Signed-off-by: default avatarStuart Henderson <stuarth@opensource.cirrus.com>
Link: https://msgid.link/r/20240306161439.1385643-2-stuarth@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 03c78741

sound/soc/codecs/wm8962.c

+14 −9
Original line number Diff line number Diff line
@@ -2229,6 +2229,9 @@ SND_SOC_DAPM_PGA_E("HPOUT", SND_SOC_NOPM, 0, 0, NULL, 0, hp_event, 


SND_SOC_DAPM_OUTPUT("HPOUTL"),

SND_SOC_DAPM_OUTPUT("HPOUTR"),



SND_SOC_DAPM_PGA("SPKOUTL Output", WM8962_CLASS_D_CONTROL_1, 6, 0, NULL, 0),

SND_SOC_DAPM_PGA("SPKOUTR Output", WM8962_CLASS_D_CONTROL_1, 7, 0, NULL, 0),

};



static const struct snd_soc_dapm_widget wm8962_dapm_spk_mono_widgets[] = {
@@ -2236,7 +2239,6 @@ SND_SOC_DAPM_MIXER("Speaker Mixer", WM8962_MIXER_ENABLES, 1, 0, 
		   spkmixl, ARRAY_SIZE(spkmixl)),

SND_SOC_DAPM_MUX_E("Speaker PGA", WM8962_PWR_MGMT_2, 4, 0, &spkoutl_mux,

		   out_pga_event, SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA("Speaker Output", WM8962_CLASS_D_CONTROL_1, 7, 0, NULL, 0),

SND_SOC_DAPM_OUTPUT("SPKOUT"),

};
@@ -2251,9 +2253,6 @@ SND_SOC_DAPM_MUX_E("SPKOUTL PGA", WM8962_PWR_MGMT_2, 4, 0, &spkoutl_mux, 
SND_SOC_DAPM_MUX_E("SPKOUTR PGA", WM8962_PWR_MGMT_2, 3, 0, &spkoutr_mux,

		   out_pga_event, SND_SOC_DAPM_POST_PMU),



SND_SOC_DAPM_PGA("SPKOUTR Output", WM8962_CLASS_D_CONTROL_1, 7, 0, NULL, 0),

SND_SOC_DAPM_PGA("SPKOUTL Output", WM8962_CLASS_D_CONTROL_1, 6, 0, NULL, 0),



SND_SOC_DAPM_OUTPUT("SPKOUTL"),

SND_SOC_DAPM_OUTPUT("SPKOUTR"),

};
@@ -2366,12 +2365,18 @@ static const struct snd_soc_dapm_route wm8962_spk_mono_intercon[] = { 
	{ "Speaker PGA", "Mixer", "Speaker Mixer" },

	{ "Speaker PGA", "DAC", "DACL" },



	{ "Speaker Output", NULL, "Speaker PGA" },

	{ "Speaker Output", NULL, "SYSCLK" },

	{ "Speaker Output", NULL, "TOCLK" },

	{ "Speaker Output", NULL, "TEMP_SPK" },

	{ "SPKOUTL Output", NULL, "Speaker PGA" },

	{ "SPKOUTL Output", NULL, "SYSCLK" },

	{ "SPKOUTL Output", NULL, "TOCLK" },

	{ "SPKOUTL Output", NULL, "TEMP_SPK" },



	{ "SPKOUTR Output", NULL, "Speaker PGA" },

	{ "SPKOUTR Output", NULL, "SYSCLK" },

	{ "SPKOUTR Output", NULL, "TOCLK" },

	{ "SPKOUTR Output", NULL, "TEMP_SPK" },



	{ "SPKOUT", NULL, "Speaker Output" },

	{ "SPKOUT", NULL, "SPKOUTL Output" },

	{ "SPKOUT", NULL, "SPKOUTR Output" },

};



static const struct snd_soc_dapm_route wm8962_spk_stereo_intercon[] = {