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

Commit e04d6e55 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: twl4030: Convert MICBIAS to SUPPLY widget 



In order to avoid breakage update the machine drivers at the same time using
twl4030: omap3pandora, sdp3430 and zoom2

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 57296cc2

sound/soc/codecs/twl4030.c

+7 −3
Original line number Diff line number Diff line
@@ -1479,9 +1479,13 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 
	SND_SOC_DAPM_SUPPLY("micbias2 select", TWL4030_REG_MICBIAS_CTL, 6, 0,

			    NULL, 0),



	SND_SOC_DAPM_MICBIAS("Mic Bias 1", TWL4030_REG_MICBIAS_CTL, 0, 0),

	SND_SOC_DAPM_MICBIAS("Mic Bias 2", TWL4030_REG_MICBIAS_CTL, 1, 0),

	SND_SOC_DAPM_MICBIAS("Headset Mic Bias", TWL4030_REG_MICBIAS_CTL, 2, 0),

	/* Microphone bias */

	SND_SOC_DAPM_SUPPLY("Mic Bias 1",

			    TWL4030_REG_MICBIAS_CTL, 0, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("Mic Bias 2",

			    TWL4030_REG_MICBIAS_CTL, 1, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY("Headset Mic Bias",

			    TWL4030_REG_MICBIAS_CTL, 2, 0, NULL, 0),



	SND_SOC_DAPM_SUPPLY("VIF Enable", TWL4030_REG_VOICE_IF, 0, 0, NULL, 0),

};

sound/soc/omap/omap3pandora.c

+4 −4
Original line number Diff line number Diff line
@@ -144,11 +144,11 @@ static const struct snd_soc_dapm_route omap3pandora_in_map[] = { 
	{"AUXL", NULL, "Line In"},

	{"AUXR", NULL, "Line In"},



	{"MAINMIC", NULL, "Mic Bias 1"},

	{"Mic Bias 1", NULL, "Mic (internal)"},

	{"MAINMIC", NULL, "Mic (internal)"},

	{"Mic (internal)", NULL, "Mic Bias 1"},



	{"SUBMIC", NULL, "Mic Bias 2"},

	{"Mic Bias 2", NULL, "Mic (external)"},

	{"SUBMIC", NULL, "Mic (external)"},

	{"Mic (external)", NULL, "Mic Bias 2"},

};



static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)

sound/soc/omap/sdp3430.c

+7 −7
Original line number Diff line number Diff line
@@ -105,18 +105,18 @@ static const struct snd_soc_dapm_widget sdp3430_twl4030_dapm_widgets[] = { 


static const struct snd_soc_dapm_route audio_map[] = {

	/* External Mics: MAINMIC, SUBMIC with bias */

	{"MAINMIC", NULL, "Mic Bias 1"},

	{"SUBMIC", NULL, "Mic Bias 2"},

	{"Mic Bias 1", NULL, "Ext Mic"},

	{"Mic Bias 2", NULL, "Ext Mic"},

	{"MAINMIC", NULL, "Ext Mic"},

	{"SUBMIC", NULL, "Ext Mic"},

	{"Ext Mic", NULL, "Mic Bias 1"},

	{"Ext Mic", NULL, "Mic Bias 2"},



	/* External Speakers: HFL, HFR */

	{"Ext Spk", NULL, "HFL"},

	{"Ext Spk", NULL, "HFR"},



	/* Headset Mic: HSMIC with bias */

	{"HSMIC", NULL, "Headset Mic Bias"},

	{"Headset Mic Bias", NULL, "Headset Mic"},

	{"HSMIC", NULL, "Headset Mic"},

	{"Headset Mic", NULL, "Headset Mic Bias"},



	/* Headset Stereophone (Headphone): HSOL, HSOR */

	{"Headset Stereophone", NULL, "HSOL"},

sound/soc/omap/zoom2.c

+7 −7
Original line number Diff line number Diff line
@@ -70,10 +70,10 @@ static const struct snd_soc_dapm_widget zoom2_twl4030_dapm_widgets[] = { 


static const struct snd_soc_dapm_route audio_map[] = {

	/* External Mics: MAINMIC, SUBMIC with bias */

	{"MAINMIC", NULL, "Mic Bias 1"},

	{"SUBMIC", NULL, "Mic Bias 2"},

	{"Mic Bias 1", NULL, "Ext Mic"},

	{"Mic Bias 2", NULL, "Ext Mic"},

	{"MAINMIC", NULL, "Ext Mic"},

	{"SUBMIC", NULL, "Ext Mic"},

	{"Ext Mic", NULL, "Mic Bias 1"},

	{"Ext Mic", NULL, "Mic Bias 2"},



	/* External Speakers: HFL, HFR */

	{"Ext Spk", NULL, "HFL"},
@@ -84,8 +84,8 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"Headset Stereophone", NULL, "HSOR"},



	/* Headset Mic: HSMIC with bias */

	{"HSMIC", NULL, "Headset Mic Bias"},

	{"Headset Mic Bias", NULL, "Headset Mic"},

	{"HSMIC", NULL, "Headset Mic"},

	{"Headset Mic", NULL, "Headset Mic Bias"},



	/* Aux In: AUXL, AUXR */

	{"Aux In", NULL, "AUXL"},