From: Danny Milosavljevic <dannym@scratchpost.org>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>,
alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: Danny Milosavljevic <dannym@scratchpost.org>
Subject: [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes
Date: Fri, 9 Jun 2017 08:22:06 +0200 [thread overview]
Message-ID: <20170609062216.26807-3-dannym@scratchpost.org> (raw)
In-Reply-To: <20170609062216.26807-1-dannym@scratchpost.org>
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
sound/soc/sunxi/sun4i-codec.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 2f65aa72..a2435c6e 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -96,6 +96,7 @@
#define SUN4I_CODEC_ADC_ACTL_VMICEN (27)
#define SUN4I_CODEC_ADC_ACTL_VADCG (20)
#define SUN4I_CODEC_ADC_ACTL_ADCIS (17)
+#define SUN4I_CODEC_ADC_ACTL_LNRDF (16)
#define SUN4I_CODEC_ADC_ACTL_PA_EN (4)
#define SUN4I_CODEC_ADC_ACTL_DDE (3)
#define SUN4I_CODEC_ADC_DEBUG (0x2c)
@@ -644,6 +645,20 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =
static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);
+static const char * const sun4i_codec_difflinein_capture_source[] = {
+ "Stereo",
+ "Differential",
+};
+
+static SOC_ENUM_SINGLE_DECL(sun4i_codec_enum_difflinein_capture_source,
+ SUN4I_CODEC_ADC_ACTL,
+ SUN4I_CODEC_ADC_ACTL_LNRDF,
+ sun4i_codec_difflinein_capture_source);
+
+static const struct snd_kcontrol_new sun4i_codec_difflinein_capture_source_controls =
+ SOC_DAPM_ENUM("Differential Line Capture Switch",
+ sun4i_codec_enum_difflinein_capture_source);
+
static const struct snd_kcontrol_new sun4i_codec_controls[] = {
SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,
SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,
@@ -720,6 +735,12 @@ 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),
+ /* MUX */
+ SND_SOC_DAPM_MUX("Differential Line Capture Switch", SND_SOC_NOPM,
+ 0,
+ 0,
+ &sun4i_codec_difflinein_capture_source_controls),
+
/* Inputs */
SND_SOC_DAPM_INPUT("Mic1"),
SND_SOC_DAPM_INPUT("Mic2"),
@@ -767,6 +788,11 @@ 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" },
+
+ /* LNRDF Routes */
+ { "Differential Line Capture Switch", "Differential", "Line Left" },
+ { "Differential Line Capture Switch", "Differential", "Line Right" },
+
};
static struct snd_soc_codec_driver sun4i_codec_codec = {
WARNING: multiple messages have this Message-ID (diff)
From: dannym@scratchpost.org (Danny Milosavljevic)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes
Date: Fri, 9 Jun 2017 08:22:06 +0200 [thread overview]
Message-ID: <20170609062216.26807-3-dannym@scratchpost.org> (raw)
In-Reply-To: <20170609062216.26807-1-dannym@scratchpost.org>
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
sound/soc/sunxi/sun4i-codec.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 2f65aa72..a2435c6e 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -96,6 +96,7 @@
#define SUN4I_CODEC_ADC_ACTL_VMICEN (27)
#define SUN4I_CODEC_ADC_ACTL_VADCG (20)
#define SUN4I_CODEC_ADC_ACTL_ADCIS (17)
+#define SUN4I_CODEC_ADC_ACTL_LNRDF (16)
#define SUN4I_CODEC_ADC_ACTL_PA_EN (4)
#define SUN4I_CODEC_ADC_ACTL_DDE (3)
#define SUN4I_CODEC_ADC_DEBUG (0x2c)
@@ -644,6 +645,20 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =
static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);
+static const char * const sun4i_codec_difflinein_capture_source[] = {
+ "Stereo",
+ "Differential",
+};
+
+static SOC_ENUM_SINGLE_DECL(sun4i_codec_enum_difflinein_capture_source,
+ SUN4I_CODEC_ADC_ACTL,
+ SUN4I_CODEC_ADC_ACTL_LNRDF,
+ sun4i_codec_difflinein_capture_source);
+
+static const struct snd_kcontrol_new sun4i_codec_difflinein_capture_source_controls =
+ SOC_DAPM_ENUM("Differential Line Capture Switch",
+ sun4i_codec_enum_difflinein_capture_source);
+
static const struct snd_kcontrol_new sun4i_codec_controls[] = {
SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,
SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,
@@ -720,6 +735,12 @@ 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),
+ /* MUX */
+ SND_SOC_DAPM_MUX("Differential Line Capture Switch", SND_SOC_NOPM,
+ 0,
+ 0,
+ &sun4i_codec_difflinein_capture_source_controls),
+
/* Inputs */
SND_SOC_DAPM_INPUT("Mic1"),
SND_SOC_DAPM_INPUT("Mic2"),
@@ -767,6 +788,11 @@ 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" },
+
+ /* LNRDF Routes */
+ { "Differential Line Capture Switch", "Differential", "Line Left" },
+ { "Differential Line Capture Switch", "Differential", "Line Right" },
+
};
static struct snd_soc_codec_driver sun4i_codec_codec = {
next prev parent reply other threads:[~2017-06-09 6:24 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 6:22 [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 6:22 ` [PATCH v11 01/12] sun4i-codec: Add inputs: Mic2, Line Right, Line Left, FM Right, FM Left Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic [this message]
2017-06-09 6:22 ` [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes Danny Milosavljevic
2017-06-09 7:29 ` Chen-Yu Tsai
2017-06-09 7:29 ` Chen-Yu Tsai
2017-06-09 7:29 ` Chen-Yu Tsai
2017-06-09 6:22 ` [PATCH v11 03/12] sun4i-codec: Add Line Playback Volume, FM Playback Volume, Mic Playback Volume, Capture Volume, Line Capture Volume Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 6:22 ` [PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2 " Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 7:45 ` Chen-Yu Tsai
2017-06-09 7:45 ` Chen-Yu Tsai
2017-06-09 7:45 ` Chen-Yu Tsai
2017-06-09 6:22 ` [PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 7:46 ` Chen-Yu Tsai
2017-06-09 7:46 ` Chen-Yu Tsai
2017-06-09 6:22 ` [PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 7:47 ` Chen-Yu Tsai
2017-06-09 7:47 ` Chen-Yu Tsai
2017-06-09 7:47 ` Chen-Yu Tsai
2017-06-09 6:22 ` [PATCH v11 07/12] sun4i-codec: Add extra controls to sun4i_codec_quirks, sun7i_codec_quirks Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 7:48 ` Chen-Yu Tsai
2017-06-09 7:48 ` Chen-Yu Tsai
2017-06-09 7:48 ` Chen-Yu Tsai
2017-06-09 6:22 ` [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
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 6:22 ` [PATCH v11 09/12] sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 6:22 ` [PATCH v11 10/12] sun4i-codec: Add Left Capture Select, Right Capture Select Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 6:22 ` [PATCH v11 11/12] sun4i-codec: Add MIC2 Pre-Amplifier Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 6:22 ` [PATCH v11 12/12] sun4i-codec: Add routes for playback switches, Mic2, Capture Select Danny Milosavljevic
2017-06-09 6:22 ` Danny Milosavljevic
2017-06-09 7:14 ` [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Chen-Yu Tsai
2017-06-09 7:14 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170609062216.26807-3-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.