lkml.org 
[lkml]   [2017]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v12 11/14] sun4i-codec: Add Line Right, Line Left, Line Playback Switch.
    Date
    ---
    sound/soc/sunxi/sun4i-codec.c | 9 +++++++++
    1 file changed, 9 insertions(+)

    diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
    index 564df33..bcd665d 100644
    --- a/sound/soc/sunxi/sun4i-codec.c
    +++ b/sound/soc/sunxi/sun4i-codec.c
    @@ -67,6 +67,8 @@
    #define SUN4I_CODEC_DAC_ACTL_LNG (26)
    #define SUN4I_CODEC_DAC_ACTL_FMG (23)
    #define SUN4I_CODEC_DAC_ACTL_MICG (20)
    +#define SUN4I_CODEC_DAC_ACTL_LLNS (19)
    +#define SUN4I_CODEC_DAC_ACTL_RLNS (18)
    #define SUN4I_CODEC_DAC_ACTL_LFMS (17)
    #define SUN4I_CODEC_DAC_ACTL_RFMS (16)
    #define SUN4I_CODEC_DAC_ACTL_LDACLMIXS (15)
    @@ -716,6 +718,9 @@ 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("Line Playback Switch", SUN4I_CODEC_DAC_ACTL,
    + SUN4I_CODEC_DAC_ACTL_LLNS,
    + SUN4I_CODEC_DAC_ACTL_RLNS, 1, 0),
    SOC_DAPM_DOUBLE("FM Playback Switch", SUN4I_CODEC_DAC_ACTL,
    SUN4I_CODEC_DAC_ACTL_LFMS,
    SUN4I_CODEC_DAC_ACTL_RFMS, 1, 0),
    @@ -787,6 +792,8 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = {
    SND_SOC_DAPM_SWITCH("Power Amplifier Mute", SND_SOC_NOPM, 0, 0,
    &sun4i_codec_pa_mute),

    + SND_SOC_DAPM_INPUT("Line Right"),
    + SND_SOC_DAPM_INPUT("Line Left"),
    SND_SOC_DAPM_INPUT("FM Right"),
    SND_SOC_DAPM_INPUT("FM Left"),
    SND_SOC_DAPM_INPUT("Mic1"),
    @@ -809,6 +816,7 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
    { "Right Mixer", NULL, "Mixer Enable" },
    { "Right Mixer", "DAC Playback Switch", "Left DAC" },
    { "Right Mixer", "Right Mixer Left DAC Playback Switch", "Left DAC" },
    + { "Right Mixer", "Line Playback Switch", "Line Right" },
    { "Right Mixer", "FM Playback Switch", "FM Right" },
    { "Right Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
    { "Right Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
    @@ -816,6 +824,7 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
    /* Left Mixer Routes */
    { "Left Mixer", NULL, "Mixer Enable" },
    { "Left Mixer", "DAC Playback Switch", "Left DAC" },
    + { "Left Mixer", "Line Playback Switch", "Line Left" },
    { "Left Mixer", "FM Playback Switch", "FM Left" },
    { "Left Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
    { "Left Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
    --
    2.1.4
    \
     
     \ /
      Last update: 2017-06-12 01:52    [W:2.538 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site