Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1662754
| From | Danny Milosavljevic <dannym@scratchpost.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v12 04/14] sun4i-codec: Add Mic1 Boost Volume, Mic2 Boost Volume. |
| Date | 2017-06-09 23:00 +0200 |
| Message-ID | <tQzaH-6hr-47@gated-at.bofh.it> (permalink) |
| References | <tQzaF-6hr-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
---
sound/soc/sunxi/sun4i-codec.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 42952af..c69b55c 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -95,6 +95,8 @@
#define SUN4I_CODEC_ADC_ACTL_PREG1EN (29)
#define SUN4I_CODEC_ADC_ACTL_PREG2EN (28)
#define SUN4I_CODEC_ADC_ACTL_VMICEN (27)
+#define SUN4I_CODEC_ADC_ACTL_PREG1 (25)
+#define SUN4I_CODEC_ADC_ACTL_PREG2 (23)
#define SUN4I_CODEC_ADC_ACTL_VADCG (20)
#define SUN4I_CODEC_ADC_ACTL_ADCIS (17)
#define SUN4I_CODEC_ADC_ACTL_PA_EN (4)
@@ -111,6 +113,9 @@
/* Microphone controls (sun7i only) */
#define SUN7I_CODEC_AC_MIC_PHONE_CAL (0x3c)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1 (29)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2 (26)
+
/*
* sun6i specific registers
*
@@ -646,6 +651,12 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =
static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);
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,
+ 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+ 1, 7, TLV_DB_SCALE_ITEM(3500, 300, 0));
+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 struct snd_kcontrol_new sun4i_codec_controls[] = {
SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,
@@ -656,6 +667,24 @@ static const struct snd_kcontrol_new sun4i_codec_controls[] = {
sun4i_codec_micin_loopback_gain_scale),
};
+static const struct snd_kcontrol_new sun4i_codec_extra_controls[] = {
+ SOC_SINGLE_TLV("Mic1 Boost Volume", SUN4I_CODEC_ADC_ACTL,
+ SUN4I_CODEC_ADC_ACTL_PREG1, 3, 0,
+ sun4i_codec_micin_preamp_gain_scale),
+ SOC_SINGLE_TLV("Mic2 Boost Volume", SUN4I_CODEC_ADC_ACTL,
+ SUN4I_CODEC_ADC_ACTL_PREG2, 3, 0,
+ sun4i_codec_micin_preamp_gain_scale),
+};
+
+static const struct snd_kcontrol_new sun7i_codec_extra_controls[] = {
+ SOC_SINGLE_TLV("Mic1 Boost Volume", SUN7I_CODEC_AC_MIC_PHONE_CAL,
+ SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1, 7, 0,
+ sun7i_codec_micin_preamp_gain_scale),
+ SOC_SINGLE_TLV("Mic2 Boost Volume", SUN7I_CODEC_AC_MIC_PHONE_CAL,
+ SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2, 7, 0,
+ sun7i_codec_micin_preamp_gain_scale),
+};
+
static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[] = {
SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL,
SUN4I_CODEC_DAC_ACTL_LDACLMIXS, 1, 0),
@@ -1464,6 +1493,8 @@ static const struct sun4i_codec_quirks sun4i_codec_quirks = {
.reg_adc_fifoc = REG_FIELD(SUN4I_CODEC_ADC_FIFOC, 0, 31),
.reg_dac_txdata = SUN4I_CODEC_DAC_TXDATA,
.reg_adc_rxdata = SUN4I_CODEC_ADC_RXDATA,
+ .controls = sun4i_codec_extra_controls,
+ .num_controls = ARRAY_SIZE(sun4i_codec_extra_controls),
};
static const struct sun4i_codec_quirks sun6i_a31_codec_quirks = {
@@ -1483,6 +1514,8 @@ static const struct sun4i_codec_quirks sun7i_codec_quirks = {
.reg_adc_fifoc = REG_FIELD(SUN4I_CODEC_ADC_FIFOC, 0, 31),
.reg_dac_txdata = SUN4I_CODEC_DAC_TXDATA,
.reg_adc_rxdata = SUN4I_CODEC_ADC_RXDATA,
+ .controls = sun7i_codec_extra_controls,
+ .num_controls = ARRAY_SIZE(sun7i_codec_extra_controls),
};
static const struct sun4i_codec_quirks sun8i_a23_codec_quirks = {
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll 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