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 v12 07/14] sun4i-codec: Add FM Playback Volume.
Date: Fri, 9 Jun 2017 22:49:36 +0200 [thread overview]
Message-ID: <20170609204943.29116-8-dannym@scratchpost.org> (raw)
In-Reply-To: <20170609204943.29116-1-dannym@scratchpost.org>
---
sound/soc/sunxi/sun4i-codec.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 55687f9..5b6f100 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -64,6 +64,7 @@
#define SUN4I_CODEC_DAC_ACTL_DACAENR (31)
#define SUN4I_CODEC_DAC_ACTL_DACAENL (30)
#define SUN4I_CODEC_DAC_ACTL_MIXEN (29)
+#define SUN4I_CODEC_DAC_ACTL_FMG (23)
#define SUN4I_CODEC_DAC_ACTL_MICG (20)
#define SUN4I_CODEC_DAC_ACTL_LDACLMIXS (15)
#define SUN4I_CODEC_DAC_ACTL_RDACRMIXS (14)
@@ -653,6 +654,8 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =
SUN4I_CODEC_DAC_ACTL_PA_MUTE, 1, 0);
static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);
+static DECLARE_TLV_DB_SCALE(sun4i_codec_fmin_loopback_gain_scale, -450, 150,
+ 0);
static DECLARE_TLV_DB_SCALE(sun4i_codec_micin_loopback_gain_scale, -450, 150,
0);
static DECLARE_TLV_DB_RANGE(sun4i_codec_micin_preamp_gain_scale,
@@ -666,6 +669,9 @@ 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,
sun4i_codec_pa_volume_scale),
+ SOC_SINGLE_TLV("FM Playback Volume", SUN4I_CODEC_DAC_ACTL,
+ SUN4I_CODEC_DAC_ACTL_FMG, 3, 0,
+ sun4i_codec_fmin_loopback_gain_scale),
SOC_SINGLE_TLV("Mic Playback Volume", SUN4I_CODEC_DAC_ACTL,
SUN4I_CODEC_DAC_ACTL_MICG, 7, 0,
sun4i_codec_micin_loopback_gain_scale),
--
2.1.4
next prev parent reply other threads:[~2017-06-09 20:50 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 ` [PATCH v12 06/14] sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch Danny Milosavljevic
2017-06-09 20:49 ` Danny Milosavljevic [this message]
2017-06-09 20:49 ` [PATCH v12 08/14] sun4i-codec: Add FM Left, FM Right, FM " 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-8-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 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).