From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yassin Jaffer Subject: Re: [PATCH v7 2/2] sun4i-codec: Add FM, Line and Mic inputs Date: Mon, 21 Dec 2015 12:06:50 +1100 Message-ID: References: <20151219034511.372575d3@dayas> <20151219035936.1880d07f@dayas> Reply-To: yassinjaffer-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=089e0149c028a0c23105275e1a8b Return-path: In-Reply-To: <20151219035936.1880d07f@dayas> List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , To: dannym-bxPqe3T81XXwRsdMLXbzog@public.gmane.org Cc: Maxime Ripard , Mark Brown , Chen-Yu Tsai , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, Jaroslav Kysela , Takashi Iwai , Liam Girdwood , "linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org" List-Id: alsa-devel@alsa-project.org --089e0149c028a0c23105275e1a8b Content-Type: text/plain; charset=UTF-8 Hi Danny + {"Capture Source", "Line-In", "Line-In"}, + {"Capture Source", "FM", "FM"}, The ADC Capturing Sources routing doesn't look right. There is no FM/Line-In source widgets for this routing n your patch. + {"Capture Source", "Line-In,Mic1", "Line-In"}, + {"Capture Source", "Line-In,Mic1", "MIC1 Pre-Amplifier"}, and her too. I'm not familiar with the CODEC ADC mux but you may want to use {"Capture Source", "Line-In", "Line-In Right"}, {"Capture Source", "Line-In", "Line-In Left"}, {"Capture Source", "FM", "FM Right"}, {"Capture Source", "FM", "FM Left"}, Regards On Sat, Dec 19, 2015 at 1:59 PM, Danny Milosavljevic wrote: > This is the second part, actually adding FM, Line and Mic inputs. > > Signed-off-by: Danny Milosavljevic > --- > b/sound/soc/sunxi/sun4i-codec.c | 182 > +++++++++++++++++++++++++++++++++++++++- > 1 file changed, 178 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c > index 6628e6e..9a9ad62 100644 > --- a/sound/soc/sunxi/sun4i-codec.c > +++ b/sound/soc/sunxi/sun4i-codec.c > @@ -59,9 +59,20 @@ > #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_LNG (26) > +#define SUN4I_CODEC_DAC_ACTL_FMG (23) > +#define SUN4I_CODEC_DAC_ACTL_MICG (20) > +#define SUN4I_CODEC_DAC_ACTL_LLNS (19) > +#define SUN4I_CODEC_DAC_ACTL_RLNS (18) > +#define SUN4I_CODEC_DAC_ACTL_LFMS (17) > +#define SUN4I_CODEC_DAC_ACTL_RFMS (16) > #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) > @@ -87,8 +98,11 @@ > #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_VADCG (20) > +#define SUN4I_CODEC_ADC_ACTL_PREG1_A10 (25) > +#define SUN4I_CODEC_ADC_ACTL_PREG2_A10 (23) > +#define SUN4I_CODEC_ADC_ACTL_ADCG (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) > @@ -100,6 +114,16 @@ > #define SUN7I_CODEC_AC_DAC_CAL (0x38) > #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) > +/* note: no idea where the output pins for the following are. */ > +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTG (5) > +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTEN (4) > +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS3 (3) > +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS2 (2) > +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS1 (1) > +#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS0 (0) > + > struct sun4i_codec { > struct device *dev; > struct regmap *regmap; > @@ -509,19 +533,102 @@ 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_linein_loopback_gain_scale, > + -150, > + 150, > + 0); > +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_a10, > + 0, 0, TLV_DB_SCALE_ITEM(0, 0, 0), > + 1, 7, TLV_DB_SCALE_ITEM(3500, 300, 0)); > +static DECLARE_TLV_DB_SCALE(sun4i_codec_adc_gain_scale, -450, 150, 0); > +/* Sources: > + * A10 User Manual v1.5 20130820 > + * A20 User Manual v1.4 20150510 > + */ > +static const char * const sun4i_codec_capture_source[] = { > + "Line-In", > + "FM", > + "Mic1", > + "Mic2", > + "Mic1,Mic2", > + "Mic1+Mic2", > + "Output Mixer", > + "Line-In,Mic1", > +}; > +static SOC_ENUM_SINGLE_DECL(sun4i_codec_enum_capture_source, > + SUN4I_CODEC_ADC_ACTL, > + SUN4I_CODEC_ADC_ACTL_ADCIS, > + sun4i_codec_capture_source); > + > +static const struct snd_kcontrol_new sun4i_codec_capture_source_controls = > + SOC_DAPM_ENUM("Route", sun4i_codec_enum_capture_source); > > #define SUN4I_COMMON_CODEC_WIDGETS \ > - 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("Power Amplifier Playback Volume", > SUN4I_CODEC_DAC_ACTL,\ > + SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0, \ > + sun4i_codec_pa_volume_scale), \ > + /* Line-In, FM, Mic1, Mic2 */ \ > + SOC_SINGLE_TLV("Line-In Playback Volume", \ > + SUN4I_CODEC_DAC_ACTL, \ > + SUN4I_CODEC_DAC_ACTL_LNG, \ > + 1, \ > + 0, \ > + sun4i_codec_linein_loopback_gain_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), \ > + /* ADC */ \ > + SOC_SINGLE_TLV("Capture Volume", \ > + SUN4I_CODEC_ADC_ACTL, \ > + SUN4I_CODEC_ADC_ACTL_ADCG, \ > + 4, \ > + 0, \ > + sun4i_codec_adc_gain_scale) > > static const struct snd_kcontrol_new sun4i_codec_widgets_a10[] = { > SUN4I_COMMON_CODEC_WIDGETS, > + SOC_SINGLE_TLV("Mic1 Capture Volume", > + SUN4I_CODEC_ADC_ACTL, > + SUN4I_CODEC_ADC_ACTL_PREG1_A10, > + 3, > + 0, > + sun4i_codec_micin_preamp_gain_scale_a10), > + SOC_SINGLE_TLV("Mic2 Capture Volume", > + SUN4I_CODEC_ADC_ACTL, > + SUN4I_CODEC_ADC_ACTL_PREG2_A10, > + 3, > + 0, > + sun4i_codec_micin_preamp_gain_scale_a10), > }; > > 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), > + SOC_DAPM_SINGLE("Left Line-In Playback Switch", > SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_LLNS, 1, 0), > + SOC_DAPM_SINGLE("Left FM Playback Switch", SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_LFMS, 1, 0), > + SOC_DAPM_SINGLE("Mic1 Playback Switch", SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_MIC1LS, 1, 0), > + SOC_DAPM_SINGLE("Mic2 Playback Switch", SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_MIC2LS, 1, 0), > }; > > static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls[] = > { > @@ -529,6 +636,14 @@ static const struct snd_kcontrol_new > sun4i_codec_right_mixer_controls[] = { > SUN4I_CODEC_DAC_ACTL_RDACRMIXS, 1, 0), > SOC_DAPM_SINGLE("Left DAC Playback Switch", SUN4I_CODEC_DAC_ACTL, > SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0), > + SOC_DAPM_SINGLE("Right Line-In Playback Switch", > SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_RLNS, 1, 0), > + SOC_DAPM_SINGLE("Right FM Playback Switch", SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_RFMS, 1, 0), > + SOC_DAPM_SINGLE("Mic1 Playback Switch", SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_MIC1RS, 1, 0), > + SOC_DAPM_SINGLE("Mic2 Playback Switch", SUN4I_CODEC_DAC_ACTL, > + SUN4I_CODEC_DAC_ACTL_MIC2RS, 1, 0), > }; > > static const struct snd_kcontrol_new sun4i_codec_pa_mixer_controls[] = { > @@ -561,6 +676,10 @@ static const struct snd_soc_dapm_widget > sun4i_codec_codec_dapm_widgets[] = { > SND_SOC_DAPM_DAC("Right DAC", "Codec Playback", > SUN4I_CODEC_DAC_ACTL, > SUN4I_CODEC_DAC_ACTL_DACAENR, 0), > > + /* MUX */ > + SND_SOC_DAPM_MUX("Capture Source", SND_SOC_NOPM, 0, 0, > + &sun4i_codec_capture_source_controls), > + > /* Mixers */ > SND_SOC_DAPM_MIXER("Left Mixer", SND_SOC_NOPM, 0, 0, > sun4i_codec_left_mixer_controls, > @@ -580,6 +699,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, > @@ -590,9 +711,15 @@ 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"), > + > + SND_SOC_DAPM_INPUT("Line-In Right"), > + SND_SOC_DAPM_INPUT("Line-In Left"), > + SND_SOC_DAPM_INPUT("FM Right"), > + SND_SOC_DAPM_INPUT("FM Left"), > }; > > static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { > @@ -629,6 +756,36 @@ 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" }, > + { "Right Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" }, > + { "Left Mixer", "Mic1 Playback Switch", "MIC1 Pre-Amplifier" }, > + > + /* Mic2 Routes */ > + { "Left ADC", NULL, "MIC2 Pre-Amplifier" }, > + { "Right ADC", NULL, "MIC2 Pre-Amplifier" }, > + { "MIC2 Pre-Amplifier", NULL, "Mic2"}, > + { "Mic2", NULL, "VMIC" }, > + { "Right Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" }, > + { "Left Mixer", "Mic2 Playback Switch", "MIC2 Pre-Amplifier" }, > + > + /* Line-In, FM Routes */ > + { "Right Mixer", "Right Line-In Playback Switch", "Line-In Right" > }, > + { "Left Mixer", "Left Line-In Playback Switch", "Line-In Left" }, > + { "Right Mixer", "Right FM Playback Switch", "FM Right" }, > + { "Left Mixer", "Left FM Playback Switch", "FM Left" }, > + > + /* ADC Capturing Sources */ > + {"Capture Source", "Line-In", "Line-In"}, > + {"Capture Source", "FM", "FM"}, > + {"Capture Source", "Mic1", "MIC1 Pre-Amplifier"}, > + {"Capture Source", "Mic2", "MIC2 Pre-Amplifier"}, > + {"Capture Source", "Mic1,Mic2", "MIC1 Pre-Amplifier"}, > + {"Capture Source", "Mic1,Mic2", "MIC2 Pre-Amplifier"}, > + {"Capture Source", "Mic1+Mic2", "MIC1 Pre-Amplifier"}, > + {"Capture Source", "Mic1+Mic2", "MIC2 Pre-Amplifier"}, > + {"Capture Source", "Output Mixer", "Left Mixer"}, > + {"Capture Source", "Output Mixer", "Right Mixer"}, > + {"Capture Source", "Line-In,Mic1", "Line-In"}, > + {"Capture Source", "Line-In,Mic1", "MIC1 Pre-Amplifier"}, > }; > > static struct snd_soc_codec_driver sun4i_codec_codec_a10 = { > @@ -757,8 +914,25 @@ static struct snd_soc_card > *sun4i_codec_create_card(struct device *dev) > return card; > }; > > +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 sun7i_codec_widgets[] = { > SUN4I_COMMON_CODEC_WIDGETS, > + SOC_SINGLE_TLV("Mic1 Capture 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 Capture Volume", > + SUN7I_CODEC_AC_MIC_PHONE_CAL, > + SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2, > + 7, > + 0, > + sun7i_codec_micin_preamp_gain_scale), > }; > > static struct snd_soc_codec_driver sun7i_codec_codec = { > > -- > You received this message because you are subscribed to the Google Groups > "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org For more options, visit https://groups.google.com/d/optout. --089e0149c028a0c23105275e1a8b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Danny

+=C2=A0 =C2=A0 =C2=A0 =C2= =A0{"Capture Source", "Line-In", "Line-In"},<= br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "FM", &q= uot;FM"},
The ADC Capturing Sources routing doesn't look right.=
There is no FM/Line-In source widgets for this routing n your pa= tch.
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Line-In,Mic1= ", "Line-In"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Line-In,Mic1= ", "MIC1 Pre-Amplifier"},
and her too.

I'm not familiar with the CODEC ADC mux but you may want to use
=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 {"Capture Source", "= Line-In", "Line-In Right"},
=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 {"Capture Source", "Line-In", "Lin= e-In Left"},
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 {"Capt= ure Source", "FM", "FM Right"},
=C2=A0=C2=A0 = =C2=A0 =C2=A0=C2=A0 {"Capture Source", "FM", "FM L= eft"},

Regards

On Sat, Dec 19, 2015 at 1:59 PM, Danny Milosavljevic &= lt;dannym@scrat= chpost.org> wrote:
This is = the second part, actually adding FM, Line and Mic inputs.

Signed-off-by: Danny Milosavljevic <dannym+a-bxPqe3T81XXwRsdMLXbzog@public.gmane.org>
---
=C2=A0b/sound/soc/sunxi/sun4i-codec.c |=C2=A0 182 ++++++++++++++++++= +++++++++++++++++++++-
=C2=A01 file changed, 178 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c<= br> index 6628e6e..9a9ad62 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -59,9 +59,20 @@
=C2=A0#define SUN4I_CODEC_DAC_ACTL_DACAENR=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(31)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_DACAENL=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(30)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_MIXEN=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(29)
+#define SUN4I_CODEC_DAC_ACTL_LNG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(26)
+#define SUN4I_CODEC_DAC_ACTL_FMG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(23)
+#define SUN4I_CODEC_DAC_ACTL_MICG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (20)
+#define SUN4I_CODEC_DAC_ACTL_LLNS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (19)
+#define SUN4I_CODEC_DAC_ACTL_RLNS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (18)
+#define SUN4I_CODEC_DAC_ACTL_LFMS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (17)
+#define SUN4I_CODEC_DAC_ACTL_RFMS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (16)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_LDACLMIXS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(15)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_RDACRMIXS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(14)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_LDACRMIXS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(13)
+#define SUN4I_CODEC_DAC_ACTL_MIC1LS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (12)
+#define SUN4I_CODEC_DAC_ACTL_MIC1RS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (11)
+#define SUN4I_CODEC_DAC_ACTL_MIC2LS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (10)
+#define SUN4I_CODEC_DAC_ACTL_MIC2RS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (9)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_DACPAS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (8)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_MIXPAS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (7)
=C2=A0#define SUN4I_CODEC_DAC_ACTL_PA_MUTE=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(6)
@@ -87,8 +98,11 @@
=C2=A0#define SUN4I_CODEC_ADC_ACTL_PREG1EN=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(29)
=C2=A0#define SUN4I_CODEC_ADC_ACTL_PREG2EN=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(28)
=C2=A0#define SUN4I_CODEC_ADC_ACTL_VMICEN=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (27)
-#define SUN4I_CODEC_ADC_ACTL_VADCG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(20)
+#define SUN4I_CODEC_ADC_ACTL_PREG1_A10=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(25)
+#define SUN4I_CODEC_ADC_ACTL_PREG2_A10=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0(23)
+#define SUN4I_CODEC_ADC_ACTL_ADCG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (20)
=C2=A0#define SUN4I_CODEC_ADC_ACTL_ADCIS=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(17)
+#define SUN4I_CODEC_ADC_ACTL_LNRDF=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(16)
=C2=A0#define SUN4I_CODEC_ADC_ACTL_PA_EN=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(4)
=C2=A0#define SUN4I_CODEC_ADC_ACTL_DDE=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(3)
=C2=A0#define SUN4I_CODEC_ADC_DEBUG=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 (0x2c)
@@ -100,6 +114,16 @@
=C2=A0#define SUN7I_CODEC_AC_DAC_CAL=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0(0x38)
=C2=A0#define SUN7I_CODEC_AC_MIC_PHONE_CAL=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(0x3c)

+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1=C2=A0 =C2=A0 =C2=A0 (29)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2=C2=A0 =C2=A0 =C2=A0 (26)
+/* note: no idea where the output pins for the following are. */
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTG=C2=A0 (5)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTEN (4)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS3 (3)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS2 (2)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS1 (1)
+#define SUN7I_CODEC_AC_MIC_PHONE_CAL_PHONEOUTS0 (0)
+
=C2=A0struct sun4i_codec {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 struct device=C2=A0 =C2=A0*dev;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 struct regmap=C2=A0 =C2=A0*regmap;
@@ -509,19 +533,102 @@ static const struct snd_kcontrol_new sun4i_codec_pa_= mute =3D
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 SUN4I_CODEC_DAC_ACTL_PA_MUTE, 1, 0);

=C2=A0static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, = 1);
+static DECLARE_TLV_DB_SCALE(sun4i_codec_linein_loopback_gain_scale,=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0-150,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0150,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A00);
+static DECLARE_TLV_DB_SCALE(sun4i_codec_fmin_loopback_gain_scale,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0-450,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0150,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A00);
+static DECLARE_TLV_DB_SCALE(sun4i_codec_micin_loopback_gain_scale,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0-450,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0150,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A00);
+static DECLARE_TLV_DB_RANGE(sun4i_codec_micin_preamp_gain_scale_a10,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A00, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A01, 7, TLV_DB_SCALE_ITEM(3500, 300, 0));
+static DECLARE_TLV_DB_SCALE(sun4i_codec_adc_gain_scale, -450, 150, 0);
+/* Sources:
+ *=C2=A0 =C2=A0A10 User Manual v1.5 20130820
+ *=C2=A0 =C2=A0A20 User Manual v1.4 20150510
+ */
+static const char * const sun4i_codec_capture_source[] =3D {
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"Line-In",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"FM",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"Mic1",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"Mic2",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"Mic1,Mic2",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"Mic1+Mic2",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"Output Mixer",
+=C2=A0 =C2=A0 =C2=A0 =C2=A0"Line-In,Mic1",
+};
+static SOC_ENUM_SINGLE_DECL(sun4i_codec_enum_capture_source,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0SUN4I_CODEC_ADC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0SUN4I_CODEC_ADC_ACTL_ADCIS,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0sun4i_codec_capture_source);
+
+static const struct snd_kcontrol_new sun4i_codec_capture_source_controls = =3D
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_ENUM("Route", sun4i_codec_en= um_capture_source);

=C2=A0#define SUN4I_COMMON_CODEC_WIDGETS \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Power Amp= lifier Volume", SUN4I_CODEC_DAC_ACTL,\
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,\
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_pa_volume_scale)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Power Amplifier Pla= yback Volume", SUN4I_CODEC_DAC_ACTL,\
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_pa_volume_scale), \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Line-In, FM, Mic1, Mic2 */ \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Line-In Playback Volume&qu= ot;, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL_LNG, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 1, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_linein_loopback_gain_scale), \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("FM Playback Volume", = \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL_FMG, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 3, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_fmin_loopback_gain_scale), \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Mic Playback Volume",= \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_DAC_ACTL_MICG, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 7, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_micin_loopback_gain_scale), \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0/* ADC */ \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Capture Volume", \ +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_ADC_ACTL, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_ADC_ACTL_ADCG, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 4, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0, \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_adc_gain_scale)

=C2=A0static const struct snd_kcontrol_new sun4i_codec_widgets_a10[] =3D {<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 SUN4I_COMMON_CODEC_WIDGETS,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Mic1 Capture Volume",=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_ADC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_ADC_ACTL_PREG1_A10,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 3,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_micin_preamp_gain_scale_a10),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Mic2 Capture Volume",=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_ADC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN4I_CODEC_ADC_ACTL_PREG2_A10,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 3,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun4i_codec_micin_preamp_gain_scale_a10),
=C2=A0};

=C2=A0static const struct snd_kcontrol_new sun4i_codec_left_mixer_controls[= ] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SOC_DAPM_SINGLE("Left DAC Playback = Switch", SUN4I_CODEC_DAC_ACTL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 SUN4I_CODEC_DAC_ACTL_LDACLMIXS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Left Line-In Playback Swi= tch", SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_LLNS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Left FM Playback Switch&q= uot;, SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_LFMS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Mic1 Playback Switch"= ;, SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_MIC1LS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Mic2 Playback Switch"= ;, SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_MIC2LS, 1, 0),
=C2=A0};

=C2=A0static const struct snd_kcontrol_new sun4i_codec_right_mixer_controls= [] =3D {
@@ -529,6 +636,14 @@ static const struct snd_kcontrol_new sun4i_codec_right= _mixer_controls[] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 SUN4I_CODEC_DAC_ACTL_RDACRMIXS, 1, 0),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SOC_DAPM_SINGLE("Left DAC Playback Switch&= quot;, SUN4I_CODEC_DAC_ACTL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 SUN4I_CODEC_DAC_ACTL_LDACRMIXS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Right Line-In Playback Sw= itch", SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_RLNS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Right FM Playback Switch&= quot;, SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_RFMS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Mic1 Playback Switch"= ;, SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_MIC1RS, 1, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_DAPM_SINGLE("Mic2 Playback Switch"= ;, SUN4I_CODEC_DAC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0SUN4I_CODEC_DAC_ACTL_MIC2RS, 1, 0),
=C2=A0};

=C2=A0static const struct snd_kcontrol_new sun4i_codec_pa_mixer_controls[] = =3D {
@@ -561,6 +676,10 @@ static const struct snd_soc_dapm_widget sun4i_codec_co= dec_dapm_widgets[] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_SOC_DAPM_DAC("Right DAC", "C= odec Playback", SUN4I_CODEC_DAC_ACTL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0SUN4I_CODEC_DAC_ACTL_DACAENR, 0),

+=C2=A0 =C2=A0 =C2=A0 =C2=A0/* MUX */
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SND_SOC_DAPM_MUX("Capture Source", SN= D_SOC_NOPM, 0, 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 &sun4i_codec_capture_source_controls),
+
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Mixers */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_SOC_DAPM_MIXER("Left Mixer", SND_= SOC_NOPM, 0, 0,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0sun4i_codec_left_mixer_controls,
@@ -580,6 +699,8 @@ static const struct snd_soc_dapm_widget sun4i_codec_cod= ec_dapm_widgets[] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Mic Pre-Amplifiers */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_SOC_DAPM_PGA("MIC1 Pre-Amplifier"= , SUN4I_CODEC_ADC_ACTL,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0SUN4I_CODEC_ADC_ACTL_PREG1EN, 0, NULL, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SND_SOC_DAPM_PGA("MIC2 Pre-Amplifier"= , SUN4I_CODEC_ADC_ACTL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 SUN4I_CODEC_ADC_ACTL_PREG2EN, 0, NULL, 0),

=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Power Amplifier */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_SOC_DAPM_MIXER("Power Amplifier",= SUN4I_CODEC_ADC_ACTL,
@@ -590,9 +711,15 @@ static const struct snd_soc_dapm_widget sun4i_codec_co= dec_dapm_widgets[] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 &sun4i_codec_pa_mute),

=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_SOC_DAPM_INPUT("Mic1"),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SND_SOC_DAPM_INPUT("Mic2"),

=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_SOC_DAPM_OUTPUT("HP Right"),
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_SOC_DAPM_OUTPUT("HP Left"),
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SND_SOC_DAPM_INPUT("Line-In Right"),<= br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0SND_SOC_DAPM_INPUT("Line-In Left"), +=C2=A0 =C2=A0 =C2=A0 =C2=A0SND_SOC_DAPM_INPUT("FM Right"),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SND_SOC_DAPM_INPUT("FM Left"),
=C2=A0};

=C2=A0static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[= ] =3D {
@@ -629,6 +756,36 @@ static const struct snd_soc_dapm_route sun4i_co= dec_codec_dapm_routes[] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { "Right ADC", NULL, "MIC1 Pre-A= mplifier" },
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { "MIC1 Pre-Amplifier", NULL, "M= ic1"},
=C2=A0 =C2=A0 =C2=A0 =C2=A0 { "Mic1", NULL, &quo= t;VMIC" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Right Mixer", "Mic1 Pl= ayback Switch", "MIC1 Pre-Amplifier" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Left Mixer", "Mic1 Playback S= witch", "MIC1 Pre-Amplifier" },
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Mic2 Routes */
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Left ADC", NULL, "MIC2 Pre-Am= plifier" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Right ADC", NULL, "MIC2 Pre-A= mplifier" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "MIC2 Pre-Amplifier", NULL, "M= ic2"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Mic2", NULL, "VMIC" }, +=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Right Mixer", "Mic2 Playback = Switch", "MIC2 Pre-Amplifier" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Left Mixer", "Mic2 Playback S= witch", "MIC2 Pre-Amplifier" },
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Line-In, FM Routes */
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Right Mixer", "Right Line-In = Playback Switch", "Line-In Right" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Left Mixer", "Left Line-In Pl= ayback Switch", "Line-In Left" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Right Mixer", "Right FM Playb= ack Switch", "FM Right" },
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{ "Left Mixer", "Left FM Playbac= k Switch", "FM Left" },
+
+=C2=A0 =C2=A0 =C2=A0 =C2=A0/* ADC Capturing Sources */
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Line-In"= ;, "Line-In"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "FM", &q= uot;FM"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Mic1", = "MIC1 Pre-Amplifier"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Mic2", = "MIC2 Pre-Amplifier"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Mic1,Mic2&qu= ot;, "MIC1 Pre-Amplifier"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Mic1,Mic2&qu= ot;, "MIC2 Pre-Amplifier"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Mic1+Mic2&qu= ot;, "MIC1 Pre-Amplifier"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Mic1+Mic2&qu= ot;, "MIC2 Pre-Amplifier"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Output Mixer= ", "Left Mixer"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Output Mixer= ", "Right Mixer"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Line-In,Mic1= ", "Line-In"},
+=C2=A0 =C2=A0 =C2=A0 =C2=A0{"Capture Source", "Line-In,Mic1= ", "MIC1 Pre-Amplifier"},
=C2=A0};

=C2=A0static struct snd_soc_codec_driver sun4i_codec_codec_a10 =3D {
@@ -757,8 +914,25 @@ static struct snd_soc_card *sun4i_codec_create_card(st= ruct device *dev)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 return card;
=C2=A0};

+static DECLARE_TLV_DB_RANGE(sun7i_codec_micin_preamp_gain_scale,
+=C2=A0 =C2=A0 =C2=A0 =C2=A00, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
+=C2=A0 =C2=A0 =C2=A0 =C2=A01, 7, TLV_DB_SCALE_ITEM(2400, 300, 0)
+);
+
=C2=A0static const struct snd_kcontrol_new sun7i_codec_wid= gets[] =3D {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 SUN4I_COMMON_CODEC_WIDGETS,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Mic1 Capture Volume",=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN7I_CODEC_AC_MIC_PHONE_CAL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG1,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 7,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun7i_codec_micin_preamp_gain_scale),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0SOC_SINGLE_TLV("Mic2 Capture Volume",=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN7I_CODEC_AC_MIC_PHONE_CAL,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 SUN7I_CODEC_AC_MIC_PHONE_CAL_PREG2,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 7,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 0,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 sun7i_codec_micin_preamp_gain_scale),
=C2=A0};

=C2=A0static struct snd_soc_codec_driver sun7i_codec_codec =3D {

--
You received this message because you are subscribed to the Google Groups &= quot;linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux= -sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups &= quot;linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an e= mail to linux-s= unxi+unsubscribe-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org.
For more options, visit http= s://groups.google.com/d/optout.
--089e0149c028a0c23105275e1a8b--