From: dannym@scratchpost.org (Danny Milosavljevic)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v12 06/14] sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch.
Date: Fri, 9 Jun 2017 22:49:35 +0200 [thread overview]
Message-ID: <20170609204943.29116-7-dannym@scratchpost.org> (raw)
In-Reply-To: <20170609204943.29116-1-dannym@scratchpost.org>
---
sound/soc/sunxi/sun4i-codec.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 3718137..55687f9 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -68,6 +68,10 @@
#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)
@@ -692,6 +696,12 @@ static const struct snd_kcontrol_new sun4i_codec_mixer_controls[] = {
SOC_DAPM_SINGLE("Right Mixer Left DAC Playback Switch",
SUN4I_CODEC_DAC_ACTL,
SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 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),
};
static const struct snd_kcontrol_new sun4i_codec_pa_mixer_controls[] = {
@@ -774,10 +784,14 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
{ "Right Mixer", NULL, "Mixer Enable" },
{ "Right Mixer", "DAC Playback Switch", "Left DAC" },
{ "Right Mixer", "Right Mixer Left DAC Playback Switch", "Left DAC" },
+ { "Right Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
+ { "Right Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
/* Left Mixer Routes */
{ "Left Mixer", NULL, "Mixer Enable" },
{ "Left Mixer", "DAC Playback Switch", "Left DAC" },
+ { "Left Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" },
+ { "Left Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" },
/* Power Amplifier Routes */
{ "Power Amplifier", "Mixer Playback Switch", "Left Mixer" },
--
2.1.4
next prev parent reply other threads:[~2017-06-09 20:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 20:49 [PATCH v12 00/14] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 01/14] sun4i-codec: Add MIC2 Pre-Amplifier, Mic2 Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 02/14] sun4i-codec: Add Mic Playback Volume Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 03/14] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 04/14] sun4i-codec: Add Mic1 Boost Volume, Mic2 Boost Volume Danny Milosavljevic
2017-06-09 20:49 ` [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
2017-06-09 20:49 ` Danny Milosavljevic [this message]
2017-06-09 20:49 ` [PATCH v12 07/14] sun4i-codec: Add FM Playback Volume Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 08/14] sun4i-codec: Add FM Left, FM Right, FM Playback Switch Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 09/14] sun4i-codec: Add Line Playback Volume Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 10/14] sun4i-codec: Add Line Boost Volume Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 11/14] sun4i-codec: Add Line Right, Line Left, Line Playback Switch Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 12/14] sun4i-codec: Add Differential Line Source Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 13/14] sun4i-codec: Add Left Capture Select, Right Capture Select Danny Milosavljevic
2017-06-09 20:49 ` [PATCH v12 14/14] sun4i-codec: Add Capture Volume Danny Milosavljevic
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=20170609204943.29116-7-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).