[PATCH v12 13/14] sun4i-codec: Add Left Capture Select, Right Capture Select.

From	Danny Milosavljevic <dannym@scratchpost.org>
Newsgroups	linux.kernel
Subject	[PATCH v12 13/14] sun4i-codec: Add Left Capture Select, Right Capture Select.
Date	2017-06-09 23:00 +0200
Message-ID	<tQzaG-6hr-33@gated-at.bofh.it> (permalink)
References	<tQzaF-6hr-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

---
 sound/soc/sunxi/sun4i-codec.c | 50 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 085a603..65a4685 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -676,6 +676,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_source[] = {
 	"Stereo",
 	"Differential",
@@ -808,6 +827,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 Source", SND_SOC_NOPM,
 			 0, 0,
 			 &sun4i_codec_difflinein_source_controls),
@@ -875,6 +898,33 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
 	/* LNRDF Routes */
 	{ "Differential Line Source", "Differential", "Line Left" },
 	{ "Differential Line Source", "Differential", "Line Right" },
+
+	/* Right ADC Input Routes */
+	{ "Right Capture Select", "Line", "Line Right" },
+	{ "Right Capture Select", "Line", "Differential Line Capture Switch" },
+	{ "Right Capture Select", "FM", "FM Right" },
+	{ "Right Capture Select", "Mic1", "MIC1 Pre-Amplifier" },
+	{ "Right Capture Select", "Mic2", "MIC2 Pre-Amplifier" },
+	{ "Right Capture Select", "Mic1,Mic2", "MIC2 Pre-Amplifier" },
+	{ "Right Capture Select", "Mic1+Mic2", "MIC2 Pre-Amplifier" },
+	{ "Right Capture Select", "Mic1+Mic2", "MIC1 Pre-Amplifier" },
+	{ "Right Capture Select", "Output Mixer", "Right Mixer" },
+	{ "Right Capture Select", "Line,Mic1", "MIC1 Pre-Amplifier" },
+	{ "Right ADC", NULL, "Right Capture Select" },
+
+	/* Left ADC Input Routes */
+	{ "Left Capture Select", "Line", "Line Left" },
+	{ "Left Capture Select", "Line", "Differential Line Capture Switch" },
+	{ "Left Capture Select", "FM", "FM Left" },
+	{ "Left Capture Select", "Mic1", "MIC1 Pre-Amplifier" },
+	{ "Left Capture Select", "Mic2", "MIC2 Pre-Amplifier" },
+	{ "Left Capture Select", "Mic1,Mic2", "MIC1 Pre-Amplifier" },
+	{ "Left Capture Select", "Mic1+Mic2", "MIC1 Pre-Amplifier" },
+	{ "Left Capture Select", "Mic1+Mic2", "MIC2 Pre-Amplifier" },
+	{ "Left Capture Select", "Output Mixer", "Left Mixer" },
+	{ "Left Capture Select", "Line,Mic1", "Line Left" },
+	{ "Left Capture Select", "Line,Mic1", "Differential Line Capture Switch" },
+	{ "Left ADC", NULL, "Left Capture Select" },
 };
 
 struct sun4i_codec_quirks {
-- 
2.1.4

Thread

[PATCH v12 00/14] sun4i-codec: Add Line-In, FM-In, Mic 2,  Capture Source, Differential Line-In Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 07/14] sun4i-codec: Add FM Playback Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 05/14] 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 23:00 +0200
  [PATCH v12 11/14] sun4i-codec: Add Line Right, Line Left, Line Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 14/14] sun4i-codec: Add Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 12/14] sun4i-codec: Add Differential Line Source. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 03/14] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 09/14] sun4i-codec: Add Line Playback Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 13/14] sun4i-codec: Add Left Capture Select, Right Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 06/14] sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 02/14] sun4i-codec: Add Mic Playback Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 01/14] sun4i-codec: Add MIC2 Pre-Amplifier, Mic2. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 08/14] sun4i-codec: Add FM Left, FM Right, FM Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200
  [PATCH v12 04/14] sun4i-codec: Add Mic1 Boost Volume, Mic2 Boost Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 23:00 +0200

csiph-web