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


Groups > linux.kernel > #1662752

[PATCH v12 01/14] sun4i-codec: Add MIC2 Pre-Amplifier, Mic2.

From Danny Milosavljevic <dannym@scratchpost.org>
Newsgroups linux.kernel
Subject [PATCH v12 01/14] sun4i-codec: Add MIC2 Pre-Amplifier, Mic2.
Date 2017-06-09 23:00 +0200
Message-ID <tQzaG-6hr-43@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 | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 1500699..f703293 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -711,6 +711,8 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = {
 	/* Mic Pre-Amplifiers */
 	SND_SOC_DAPM_PGA("MIC1 Pre-Amplifier", SUN4I_CODEC_ADC_ACTL,
 			 SUN4I_CODEC_ADC_ACTL_PREG1EN, 0, NULL, 0),
+	SND_SOC_DAPM_PGA("MIC2 Pre-Amplifier", SUN4I_CODEC_ADC_ACTL,
+			 SUN4I_CODEC_ADC_ACTL_PREG2EN, 0, NULL, 0),
 
 	/* Power Amplifier */
 	SND_SOC_DAPM_MIXER("Power Amplifier", SUN4I_CODEC_ADC_ACTL,
@@ -721,6 +723,7 @@ static const struct snd_soc_dapm_widget sun4i_codec_codec_dapm_widgets[] = {
 			    &sun4i_codec_pa_mute),
 
 	SND_SOC_DAPM_INPUT("Mic1"),
+	SND_SOC_DAPM_INPUT("Mic2"),
 
 	SND_SOC_DAPM_OUTPUT("HP Right"),
 	SND_SOC_DAPM_OUTPUT("HP Left"),
@@ -760,6 +763,12 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
 	{ "Right ADC", NULL, "MIC1 Pre-Amplifier" },
 	{ "MIC1 Pre-Amplifier", NULL, "Mic1"},
 	{ "Mic1", NULL, "VMIC" },
+
+	/* Mic2 Routes */
+	{ "Left ADC", NULL, "MIC2 Pre-Amplifier" },
+	{ "Right ADC", NULL, "MIC2 Pre-Amplifier" },
+	{ "MIC2 Pre-Amplifier", NULL, "Mic2"},
+	{ "Mic2", NULL, "VMIC" },
 };
 
 static struct snd_soc_codec_driver sun4i_codec_codec = {
-- 
2.1.4

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


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