Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1661963

[PATCH v11 09/12] sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch.

From Danny Milosavljevic <dannym@scratchpost.org>
Newsgroups linux.kernel
Subject [PATCH v11 09/12] sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch.
Date 2017-06-09 08:30 +0200
Message-ID <tQlAJ-6ri-9@gated-at.bofh.it> (permalink)
References <tQlAJ-6ri-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 07ed4fd4..21ece880 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -67,9 +67,17 @@
 #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)
 #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)
@@ -764,6 +772,22 @@ static const struct snd_kcontrol_new sun4i_codec_mixer_controls[] = {
 			SUN4I_CODEC_DAC_ACTL,
 			SUN4I_CODEC_DAC_ACTL_LDACLMIXS,
 			SUN4I_CODEC_DAC_ACTL_RDACRMIXS, 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),
+	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),
 	SOC_DAPM_SINGLE("Right Mixer Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
 			SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0),
 };

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2,  Capture Source, Differential Line-In Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 12/12] sun4i-codec: Add routes for playback switches, Mic2, Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 10/12] sun4i-codec: Add Left Capture Select, Right Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 07/12] sun4i-codec: Add extra controls to sun4i_codec_quirks, sun7i_codec_quirks. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 07/12] sun4i-codec: Add extra controls to  sun4i_codec_quirks, sun7i_codec_quirks. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 09/12] sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture  Switch and its routes Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:40 +0200
  [PATCH v11 11/12] sun4i-codec: Add MIC2 Pre-Amplifier. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 03/12] sun4i-codec: Add Line Playback Volume, FM Playback Volume, Mic Playback Volume, Capture Volume, Line Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2 Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2  Capture Volume. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 06/12] sun4i-codec: Add support for extra controls to  struct sun4i_codec_quirks and use them. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 01/12] sun4i-codec: Add inputs: Mic2, Line Right, Line Left, FM Right, FM Left. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 08/12] sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  Re: [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture  Source, Differential Line-In Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:20 +0200

csiph-web