Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 63bd8489 authored by Danny Milosavljevic's avatar Danny Milosavljevic Committed by Mark Brown
Browse files

ASoC: sun4i-codec: Add MIC2 Pre-Amplifier, Mic2 input 



Add MIC2 Pre-Amplifier, Mic2 input for Allwinner A10 and Allwinner A20.

Previously, there only the Mic1 input and MIC1 Pre-Amplifier was exposed.
This exposes the Mic2 input and MIC2 Pre-Amplifier.

Signed-off-by: default avatarDanny Milosavljevic <dannym@scratchpost.org>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6c3e6302

sound/soc/sunxi/sun4i-codec.c

+12 −0
Original line number Diff line number Diff line
@@ -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_MICG			(20)

#define SUN4I_CODEC_DAC_ACTL_LDACLMIXS			(15)

#define SUN4I_CODEC_DAC_ACTL_RDACRMIXS			(14)

#define SUN4I_CODEC_DAC_ACTL_LDACRMIXS			(13)
@@ -673,6 +674,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_micin_loopback_gain_scale, -450, 150,

			    0);



static const struct snd_kcontrol_new sun4i_codec_controls[] = {

	SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,
@@ -741,6 +744,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,
@@ -751,6 +756,7 @@ 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"),
@@ -790,6 +796,12 @@ 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" },



	/* Mic2 Routes */

	{ "Left ADC", NULL, "MIC2 Pre-Amplifier" },

	{ "Right ADC", NULL, "MIC2 Pre-Amplifier" },

	{ "MIC2 Pre-Amplifier", NULL, "Mic2"},

	{ "Mic2", NULL, "VMIC" },

};



static const struct snd_soc_component_driver sun4i_codec_codec = {