lkml.org 
[lkml]   [2018]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v14 4/8] ASoC: sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch
    Date
    Add Mic1 Playback Switch and Mic2 Playback Switch for Allwinner A10 and
    Allwinner A20.

    Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
    ---
    sound/soc/sunxi/sun4i-codec.c | 14 ++++++++++++++
    1 file changed, 14 insertions(+)

    diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
    index b62af407967f..0add2c44115c 100644
    --- a/sound/soc/sunxi/sun4i-codec.c
    +++ b/sound/soc/sunxi/sun4i-codec.c
    @@ -68,6 +68,10 @@
    #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)
    @@ -725,6 +729,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[] = {
    @@ -807,10 +817,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" },
    \
     
     \ /
      Last update: 2018-05-03 09:44    [W:5.292 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site