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

Commit 97b8096d authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Mark Brown
Browse files

ASoC: TWL4030: change DAPM for analog microphone selection 



The inputs of the twl4030 codec can be mixed, so we will use the mixer
DAPM for the analog microphone registers(0x05, 0x06), but if we enable
more than one input at the same time, the input impedance of the input
amplifier will be reduced.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 7de0a0ae

sound/soc/codecs/twl4030.c

+19 −33
Original line number Original line Diff line number Diff line
@@ -422,36 +422,18 @@ static const struct snd_kcontrol_new twl4030_dapm_vibrapath_control = 
SOC_DAPM_ENUM("Route", twl4030_vibrapath_enum);

SOC_DAPM_ENUM("Route", twl4030_vibrapath_enum);





/* Left analog microphone selection */

/* Left analog microphone selection */

static const char *twl4030_analoglmic_texts[] =

static const struct snd_kcontrol_new twl4030_dapm_analoglmic_controls[] = {

		{"Off", "Main mic", "Headset mic", "AUXL", "Carkit mic"};

	SOC_DAPM_SINGLE("Main mic", TWL4030_REG_ANAMICL, 0, 1, 0),



	SOC_DAPM_SINGLE("Headset mic", TWL4030_REG_ANAMICL, 1, 1, 0),

static const unsigned int twl4030_analoglmic_values[] =

	SOC_DAPM_SINGLE("AUXL", TWL4030_REG_ANAMICL, 2, 1, 0),

		{0x0, 0x1, 0x2, 0x4, 0x8};

	SOC_DAPM_SINGLE("Carkit mic", TWL4030_REG_ANAMICL, 3, 1, 0),



};

static const struct soc_enum twl4030_analoglmic_enum =

	SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICL, 0, 0xf,

			ARRAY_SIZE(twl4030_analoglmic_texts),

			twl4030_analoglmic_texts,

			twl4030_analoglmic_values);



static const struct snd_kcontrol_new twl4030_dapm_analoglmic_control =

SOC_DAPM_VALUE_ENUM("Route", twl4030_analoglmic_enum);





/* Right analog microphone selection */

/* Right analog microphone selection */

static const char *twl4030_analogrmic_texts[] =

static const struct snd_kcontrol_new twl4030_dapm_analogrmic_controls[] = {

		{"Off", "Sub mic", "AUXR"};

	SOC_DAPM_SINGLE("Sub mic", TWL4030_REG_ANAMICR, 0, 1, 0),



	SOC_DAPM_SINGLE("AUXR", TWL4030_REG_ANAMICR, 1, 1, 0),

static const unsigned int twl4030_analogrmic_values[] =

};

		{0x0, 0x1, 0x4};



static const struct soc_enum twl4030_analogrmic_enum =

	SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICR, 0, 0x5,

			ARRAY_SIZE(twl4030_analogrmic_texts),

			twl4030_analogrmic_texts,

			twl4030_analogrmic_values);



static const struct snd_kcontrol_new twl4030_dapm_analogrmic_control =

SOC_DAPM_VALUE_ENUM("Route", twl4030_analogrmic_enum);





/* TX1 L/R Analog/Digital microphone selection */

/* TX1 L/R Analog/Digital microphone selection */

static const char *twl4030_micpathtx1_texts[] =

static const char *twl4030_micpathtx1_texts[] =
@@ -1138,11 +1120,15 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 
		SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD|

		SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD|

		SND_SOC_DAPM_POST_REG),

		SND_SOC_DAPM_POST_REG),





	/* Analog input muxes with switch for the capture amplifiers */

	/* Analog input mixers for the capture amplifiers */

	SND_SOC_DAPM_VALUE_MUX("Analog Left Capture Route",

	SND_SOC_DAPM_MIXER("Analog Left Capture Route",

		TWL4030_REG_ANAMICL, 4, 0, &twl4030_dapm_analoglmic_control),

		TWL4030_REG_ANAMICL, 4, 0,

	SND_SOC_DAPM_VALUE_MUX("Analog Right Capture Route",

		&twl4030_dapm_analoglmic_controls[0],

		TWL4030_REG_ANAMICR, 4, 0, &twl4030_dapm_analogrmic_control),

		ARRAY_SIZE(twl4030_dapm_analoglmic_controls)),

	SND_SOC_DAPM_MIXER("Analog Right Capture Route",

		TWL4030_REG_ANAMICR, 4, 0,

		&twl4030_dapm_analogrmic_controls[0],

		ARRAY_SIZE(twl4030_dapm_analogrmic_controls)),





	SND_SOC_DAPM_PGA("ADC Physical Left",

	SND_SOC_DAPM_PGA("ADC Physical Left",

		TWL4030_REG_AVADC_CTL, 3, 0, NULL, 0),

		TWL4030_REG_AVADC_CTL, 3, 0, NULL, 0),