]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch
authorDanny Milosavljevic <dannym@scratchpost.org>
Wed, 30 Jan 2019 10:39:42 +0000 (11:39 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 7 Feb 2019 12:15:14 +0000 (12:15 +0000)
Add Mic1 Playback Switch and Mic2 Playback Switch for Allwinner A10 and
Allwinner A20.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sunxi/sun4i-codec.c

index 279a7880d623750e0c99587158fdd5dd52626272..87bb16e59da7b6bdd9e96ddba4bbd6f9a3792691 100644 (file)
 #define SUN4I_CODEC_DAC_ACTL_LDACLMIXS                 (15)
 #define SUN4I_CODEC_DAC_ACTL_RDACRMIXS                 (14)
 #define SUN4I_CODEC_DAC_ACTL_LDACRMIXS                 (13)
+#define SUN4I_CODEC_DAC_ACTL_MIC1LS                    (12)
+#define SUN4I_CODEC_DAC_ACTL_MIC1RS                    (11)
+#define SUN4I_CODEC_DAC_ACTL_MIC2LS                    (10)
+#define SUN4I_CODEC_DAC_ACTL_MIC2RS                    (9)
 #define SUN4I_CODEC_DAC_ACTL_DACPAS                    (8)
 #define SUN4I_CODEC_DAC_ACTL_MIXPAS                    (7)
 #define SUN4I_CODEC_DAC_ACTL_PA_MUTE                   (6)
@@ -728,6 +732,12 @@ static const struct snd_kcontrol_new sun4i_codec_mixer_controls[] = {
        SOC_DAPM_SINGLE("Right Mixer Left DAC Playback Switch",
                        SUN4I_CODEC_DAC_ACTL,
                        SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0),
+       SOC_DAPM_DOUBLE("Mic1 Playback Switch", SUN4I_CODEC_DAC_ACTL,
+                       SUN4I_CODEC_DAC_ACTL_MIC1LS,
+                       SUN4I_CODEC_DAC_ACTL_MIC1RS, 1, 0),
+       SOC_DAPM_DOUBLE("Mic2 Playback Switch", SUN4I_CODEC_DAC_ACTL,
+                       SUN4I_CODEC_DAC_ACTL_MIC2LS,
+                       SUN4I_CODEC_DAC_ACTL_MIC2RS, 1, 0),
 };
 
 static const struct snd_kcontrol_new sun4i_codec_pa_mixer_controls[] = {
@@ -810,10 +820,14 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
        { "Right Mixer", NULL, "Mixer Enable" },
        { "Right Mixer", "Right Mixer Left DAC Playback Switch", "Left DAC" },
        { "Right Mixer", "Right Mixer Right DAC Playback Switch", "Right DAC" },
+       { "Right Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
+       { "Right Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
 
        /* Left Mixer Routes */
        { "Left Mixer", NULL, "Mixer Enable" },
        { "Left Mixer", "Left Mixer Left DAC Playback Switch", "Left DAC" },
+       { "Left Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
+       { "Left Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
 
        /* Power Amplifier Routes */
        { "Power Amplifier", "Mixer Playback Switch", "Left Mixer" },