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


Groups > linux.kernel > #1661961

[PATCH v11 10/12] sun4i-codec: Add Left Capture Select, Right Capture Select.

From Danny Milosavljevic <dannym@scratchpost.org>
Newsgroups linux.kernel
Subject [PATCH v11 10/12] sun4i-codec: Add Left Capture Select, Right Capture Select.
Date 2017-06-09 08:30 +0200
Message-ID <tQlAJ-6ri-7@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 | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 21ece880..730f6151 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -685,6 +685,25 @@ static DECLARE_TLV_DB_RANGE(sun7i_codec_micin_preamp_gain_scale,
 			    0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
 			    1, 7, TLV_DB_SCALE_ITEM(2400, 300, 0));
 
+static const char * const sun4i_codec_capture_source[] = {
+	"Line",
+	"FM",
+	"Mic1",
+	"Mic2",
+	"Mic1,Mic2",
+	"Mic1+Mic2",
+	"Output Mixer",
+	"Line,Mic1",
+};
+
+static SOC_ENUM_SINGLE_DECL(sun4i_codec_enum_capture_source,
+			    SUN4I_CODEC_ADC_ACTL,
+			    SUN4I_CODEC_ADC_ACTL_ADCIS,
+			    sun4i_codec_capture_source);
+
+static const struct snd_kcontrol_new sun4i_codec_capture_source_controls =
+	SOC_DAPM_ENUM("Capture Source", sun4i_codec_enum_capture_source);
+
 static const char * const sun4i_codec_difflinein_capture_source[] = {
 	"Stereo",
 	"Differential",
@@ -851,6 +870,10 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = {
 			    &sun4i_codec_pa_mute),
 
 	/* MUX */
+	SND_SOC_DAPM_MUX("Left Capture Select", SND_SOC_NOPM, 0, 0,
+			 &sun4i_codec_capture_source_controls),
+	SND_SOC_DAPM_MUX("Right Capture Select", SND_SOC_NOPM, 0, 0,
+			 &sun4i_codec_capture_source_controls),
 	SND_SOC_DAPM_MUX("Differential Line Capture Switch", SND_SOC_NOPM,
 			 0,
 			 0,

Back to linux.kernel | Previous | Next — Previous 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