ASoC: sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_...

Since it's now possible to have a DAPM mixer control with multiple
channels, use it to cut down the total number of controls.

Keep "Left Mixer Left DAC Playback Switch" and "Right Mixer Right DAC
Playback Switch" name & layout the same as before for compatibility.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 9d509ede22c71120042c2a4d276c2d59e57c60ad..279a7880d623750e0c99587158fdd5dd52626272 100644 (file)
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -718,15 +718,15 @@ static const struct snd_kcontrol_new sun7i_codec_controls[] = {
                       sun7i_codec_micin_preamp_gain_scale),
 };
 
-static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = {
-       SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
-                       SUN4I_CODEC_DAC_ACTL_LDACLMIXS, 1, 0),
-};
-
-static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls[] = {
-       SOC_DAPM_SINGLE("Right DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
-                       SUN4I_CODEC_DAC_ACTL_RDACRMIXS, 1, 0),
-       SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
+static const struct snd_kcontrol_new sun4i_codec_mixer_controls[] = {
+       SOC_DAPM_SINGLE("Left Mixer Left DAC Playback Switch",
+                       SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_LDACLMIXS,
+                       1, 0),
+       SOC_DAPM_SINGLE("Right Mixer Right DAC Playback Switch",
+                       SUN4I_CODEC_DAC_ACTL, SUN4I_CODEC_DAC_ACTL_RDACRMIXS,
+                       1, 0),
+       SOC_DAPM_SINGLE("Right Mixer Left DAC Playback Switch",
+                       SUN4I_CODEC_DAC_ACTL,
                        SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0),
 };
 
@@ -762,11 +762,11 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = {
 
        /* Mixers */
        SND_SOC_DAPM_MIXER("Left Mixer", SND_SOC_NOPM, 0, 0,
-                          sun4i_codec_left_mixer_controls,
-                          ARRAY_SIZE(sun4i_codec_left_mixer_controls)),
+                          sun4i_codec_mixer_controls,
+                          ARRAY_SIZE(sun4i_codec_mixer_controls)),
        SND_SOC_DAPM_MIXER("Right Mixer", SND_SOC_NOPM, 0, 0,
-                          sun4i_codec_right_mixer_controls,
-                          ARRAY_SIZE(sun4i_codec_right_mixer_controls)),
+                          sun4i_codec_mixer_controls,
+                          ARRAY_SIZE(sun4i_codec_mixer_controls)),
 
        /* Global Mixer Enable */
        SND_SOC_DAPM_SUPPLY("Mixer Enable", SUN4I_CODEC_DAC_ACTL,
@@ -808,12 +808,12 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
 
        /* Right Mixer Routes */
        { "Right Mixer", NULL, "Mixer Enable" },
-       { "Right Mixer", "Left DAC Playback Switch", "Left DAC" },
-       { "Right Mixer", "Right DAC Playback Switch", "Right DAC" },
+       { "Right Mixer", "Right Mixer Left DAC Playback Switch", "Left DAC" },
+       { "Right Mixer", "Right Mixer Right DAC Playback Switch", "Right DAC" },
 
        /* Left Mixer Routes */
        { "Left Mixer", NULL, "Mixer Enable" },
-       { "Left Mixer", "Left DAC Playback Switch", "Left DAC" },
+       { "Left Mixer", "Left Mixer Left DAC Playback Switch", "Left DAC" },
 
        /* Power Amplifier Routes */
        { "Power Amplifier", "Mixer Playback Switch", "Left Mixer" },