leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: twl4030: Convert MICBIAS to SUPPLY widget

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

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2012-12-31 11:51:45 +01:00 committed by Mark Brown
parent 57296cc28c
commit e04d6e55fe
4 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/codecs/twl4030.c
View File

@ -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, SND_SOC_DAPM_SUPPLY("micbias2 select", TWL4030_REG_MICBIAS_CTL, 6, 0,
NULL, 0), NULL, 0),
SND_SOC_DAPM_MICBIAS("Mic Bias 1", TWL4030_REG_MICBIAS_CTL, 0, 0), /* Microphone bias */
SND_SOC_DAPM_MICBIAS("Mic Bias 2", TWL4030_REG_MICBIAS_CTL, 1, 0), SND_SOC_DAPM_SUPPLY("Mic Bias 1",
SND_SOC_DAPM_MICBIAS("Headset Mic Bias", TWL4030_REG_MICBIAS_CTL, 2, 0), 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), SND_SOC_DAPM_SUPPLY("VIF Enable", TWL4030_REG_VOICE_IF, 0, 0, NULL, 0),
}; };

8
sound/soc/omap/omap3pandora.c
View File

@ -144,11 +144,11 @@ static const struct snd_soc_dapm_route omap3pandora_in_map[] = {
{"AUXL", NULL, "Line In"}, {"AUXL", NULL, "Line In"},
{"AUXR", NULL, "Line In"}, {"AUXR", NULL, "Line In"},
{"MAINMIC", NULL, "Mic Bias 1"}, {"MAINMIC", NULL, "Mic (internal)"},
{"Mic Bias 1", NULL, "Mic (internal)"}, {"Mic (internal)", NULL, "Mic Bias 1"},
{"SUBMIC", NULL, "Mic Bias 2"}, {"SUBMIC", NULL, "Mic (external)"},
{"Mic Bias 2", NULL, "Mic (external)"}, {"Mic (external)", NULL, "Mic Bias 2"},
}; };
static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd) static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)

14
sound/soc/omap/sdp3430.c
View File

@ -104,19 +104,19 @@ static const struct snd_soc_dapm_widget sdp3430_twl4030_dapm_widgets[] = {
}; };
static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map[] = {
/* External Mics: MAINMIC, SUBMIC with bias*/ /* External Mics: MAINMIC, SUBMIC with bias */
{"MAINMIC", NULL, "Mic Bias 1"}, {"MAINMIC", NULL, "Ext Mic"},
{"SUBMIC", NULL, "Mic Bias 2"}, {"SUBMIC", NULL, "Ext Mic"},
{"Mic Bias 1", NULL, "Ext Mic"}, {"Ext Mic", NULL, "Mic Bias 1"},
{"Mic Bias 2", NULL, "Ext Mic"}, {"Ext Mic", NULL, "Mic Bias 2"},
/* External Speakers: HFL, HFR */ /* External Speakers: HFL, HFR */
{"Ext Spk", NULL, "HFL"}, {"Ext Spk", NULL, "HFL"},
{"Ext Spk", NULL, "HFR"}, {"Ext Spk", NULL, "HFR"},
/* Headset Mic: HSMIC with bias */ /* Headset Mic: HSMIC with bias */
{"HSMIC", NULL, "Headset Mic Bias"}, {"HSMIC", NULL, "Headset Mic"},
{"Headset Mic Bias", NULL, "Headset Mic"}, {"Headset Mic", NULL, "Headset Mic Bias"},
/* Headset Stereophone (Headphone): HSOL, HSOR */ /* Headset Stereophone (Headphone): HSOL, HSOR */
{"Headset Stereophone", NULL, "HSOL"}, {"Headset Stereophone", NULL, "HSOL"},

14
sound/soc/omap/zoom2.c
View File

@ -69,11 +69,11 @@ static const struct snd_soc_dapm_widget zoom2_twl4030_dapm_widgets[] = {
}; };
static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map[] = {
/* External Mics: MAINMIC, SUBMIC with bias*/ /* External Mics: MAINMIC, SUBMIC with bias */
{"MAINMIC", NULL, "Mic Bias 1"}, {"MAINMIC", NULL, "Ext Mic"},
{"SUBMIC", NULL, "Mic Bias 2"}, {"SUBMIC", NULL, "Ext Mic"},
{"Mic Bias 1", NULL, "Ext Mic"}, {"Ext Mic", NULL, "Mic Bias 1"},
{"Mic Bias 2", NULL, "Ext Mic"}, {"Ext Mic", NULL, "Mic Bias 2"},
/* External Speakers: HFL, HFR */ /* External Speakers: HFL, HFR */
{"Ext Spk", NULL, "HFL"}, {"Ext Spk", NULL, "HFL"},
@ -84,8 +84,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"Headset Stereophone", NULL, "HSOR"}, {"Headset Stereophone", NULL, "HSOR"},
/* Headset Mic: HSMIC with bias */ /* Headset Mic: HSMIC with bias */
{"HSMIC", NULL, "Headset Mic Bias"}, {"HSMIC", NULL, "Headset Mic"},
{"Headset Mic Bias", NULL, "Headset Mic"}, {"Headset Mic", NULL, "Headset Mic Bias"},
/* Aux In: AUXL, AUXR */ /* Aux In: AUXL, AUXR */
{"Aux In", NULL, "AUXL"}, {"Aux In", NULL, "AUXL"},