From: Mark Brown Date: Tue, 7 Oct 2008 15:13:50 +0000 (+0100) Subject: ALSA: ASoC: Make WM8510 microphone input a DAPM mixer X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b5f34c5556fc6480bcace016fc35d9d2921c38f;p=linux-beck.git ALSA: ASoC: Make WM8510 microphone input a DAPM mixer The WM8510 microphone input PGA was represented as a DAPM PGA but in DAPM terms the functionality is that of a mixer since it takes three switchable inputs and produces one output. Representing it as an input was causing its controls to be misinterpreted as gain controls and would cause some required DAPM updates to be missed. Reported-by: Jukka Hynninen Signed-off-by: Mark Brown Signed-off-by: Takashi Iwai --- diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 94cab495d5f3..ea524c4ce9f2 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -227,9 +227,9 @@ SND_SOC_DAPM_PGA("SpkN Out", WM8510_POWER3, 5, 0, NULL, 0), SND_SOC_DAPM_PGA("SpkP Out", WM8510_POWER3, 6, 0, NULL, 0), SND_SOC_DAPM_PGA("Mono Out", WM8510_POWER3, 7, 0, NULL, 0), -SND_SOC_DAPM_PGA("Mic PGA", WM8510_POWER2, 2, 0, - &wm8510_micpga_controls[0], - ARRAY_SIZE(wm8510_micpga_controls)), +SND_SOC_DAPM_MIXER("Mic PGA", WM8510_POWER2, 2, 0, + &wm8510_micpga_controls[0], + ARRAY_SIZE(wm8510_micpga_controls)), SND_SOC_DAPM_MIXER("Boost Mixer", WM8510_POWER2, 4, 0, &wm8510_boost_controls[0], ARRAY_SIZE(wm8510_boost_controls)),