ASoC: sun50i-codec-analog: Fix duplicate use of ADC enable bits

The same enable bits are currently used for both the "Left/Right ADC"
and the "Left/Right ADC Mixer" widgets. This happens to work in practice
because the widgets are always enabled/disabled at the same time, but
each register bit should only be associated with a single widget.

To keep symmetry with the DAC widgets, keep the bits on the ADC widgets,
and remove them from the ADC Mixer widgets.

Fixes: 42371f327df0 ("ASoC: sunxi: Add new driver for Allwinner A64 codec's analog path controls")
Reported-by: Ondrej Jirman <megous@megous.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Link: https://lore.kernel.org/r/20200726025334.59931-2-samuel@sholland.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c
index f5b7069bcca2aa4a234c109a93047654676bd155..cbdb31c3b7bd0ac987d5f2e45dc839bd17c8321b 100644 (file)
--- a/sound/soc/sunxi/sun50i-codec-analog.c
+++ b/sound/soc/sunxi/sun50i-codec-analog.c
@@ -363,12 +363,10 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = {
                           SUN50I_ADDA_MIX_DAC_CTRL_RMIXEN, 0,
                           sun50i_a64_codec_mixer_controls,
                           ARRAY_SIZE(sun50i_a64_codec_mixer_controls)),
-       SND_SOC_DAPM_MIXER("Left ADC Mixer", SUN50I_ADDA_ADC_CTRL,
-                          SUN50I_ADDA_ADC_CTRL_ADCLEN, 0,
+       SND_SOC_DAPM_MIXER("Left ADC Mixer", SND_SOC_NOPM, 0, 0,
                           sun50i_codec_adc_mixer_controls,
                           ARRAY_SIZE(sun50i_codec_adc_mixer_controls)),
-       SND_SOC_DAPM_MIXER("Right ADC Mixer", SUN50I_ADDA_ADC_CTRL,
-                          SUN50I_ADDA_ADC_CTRL_ADCREN, 0,
+       SND_SOC_DAPM_MIXER("Right ADC Mixer", SND_SOC_NOPM, 0, 0,
                           sun50i_codec_adc_mixer_controls,
                           ARRAY_SIZE(sun50i_codec_adc_mixer_controls)),
 };