@@ -1164,16 +1164,7 @@ static int __wcd937x_codec_enable_micbias(struct snd_soc_dapm_widget *w,
11641164 int event )
11651165{
11661166 struct snd_soc_component * component = snd_soc_dapm_to_component (w -> dapm );
1167- int micb_num ;
1168-
1169- if (strnstr (w -> name , "MIC BIAS1" , sizeof ("MIC BIAS1" )))
1170- micb_num = MIC_BIAS_1 ;
1171- else if (strnstr (w -> name , "MIC BIAS2" , sizeof ("MIC BIAS2" )))
1172- micb_num = MIC_BIAS_2 ;
1173- else if (strnstr (w -> name , "MIC BIAS3" , sizeof ("MIC BIAS3" )))
1174- micb_num = MIC_BIAS_3 ;
1175- else
1176- return - EINVAL ;
1167+ int micb_num = w -> shift ;
11771168
11781169 switch (event ) {
11791170 case SND_SOC_DAPM_PRE_PMU :
@@ -1203,16 +1194,7 @@ static int __wcd937x_codec_enable_micbias_pullup(struct snd_soc_dapm_widget *w,
12031194 int event )
12041195{
12051196 struct snd_soc_component * component = snd_soc_dapm_to_component (w -> dapm );
1206- int micb_num ;
1207-
1208- if (strnstr (w -> name , "VA MIC BIAS1" , sizeof ("VA MIC BIAS1" )))
1209- micb_num = MIC_BIAS_1 ;
1210- else if (strnstr (w -> name , "VA MIC BIAS2" , sizeof ("VA MIC BIAS2" )))
1211- micb_num = MIC_BIAS_2 ;
1212- else if (strnstr (w -> name , "VA MIC BIAS3" , sizeof ("VA MIC BIAS3" )))
1213- micb_num = MIC_BIAS_3 ;
1214- else
1215- return - EINVAL ;
1197+ int micb_num = w -> shift ;
12161198
12171199 switch (event ) {
12181200 case SND_SOC_DAPM_PRE_PMU :
@@ -2231,15 +2213,15 @@ static const struct snd_soc_dapm_widget wcd937x_dapm_widgets[] = {
22312213 SND_SOC_DAPM_POST_PMD ),
22322214
22332215 /* MIC_BIAS widgets */
2234- SND_SOC_DAPM_SUPPLY ("MIC BIAS1" , SND_SOC_NOPM , 0 , 0 ,
2216+ SND_SOC_DAPM_SUPPLY ("MIC BIAS1" , SND_SOC_NOPM , MIC_BIAS_1 , 0 ,
22352217 wcd937x_codec_enable_micbias ,
22362218 SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
22372219 SND_SOC_DAPM_POST_PMD ),
2238- SND_SOC_DAPM_SUPPLY ("MIC BIAS2" , SND_SOC_NOPM , 0 , 0 ,
2220+ SND_SOC_DAPM_SUPPLY ("MIC BIAS2" , SND_SOC_NOPM , MIC_BIAS_2 , 0 ,
22392221 wcd937x_codec_enable_micbias ,
22402222 SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
22412223 SND_SOC_DAPM_POST_PMD ),
2242- SND_SOC_DAPM_SUPPLY ("MIC BIAS3" , SND_SOC_NOPM , 0 , 0 ,
2224+ SND_SOC_DAPM_SUPPLY ("MIC BIAS3" , SND_SOC_NOPM , MIC_BIAS_3 , 0 ,
22432225 wcd937x_codec_enable_micbias ,
22442226 SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
22452227 SND_SOC_DAPM_POST_PMD ),
@@ -2320,15 +2302,15 @@ static const struct snd_soc_dapm_widget wcd937x_dapm_widgets[] = {
23202302 SND_SOC_DAPM_OUTPUT ("HPHR" ),
23212303
23222304 /* MIC_BIAS pull up widgets */
2323- SND_SOC_DAPM_SUPPLY ("VA MIC BIAS1" , SND_SOC_NOPM , 0 , 0 ,
2305+ SND_SOC_DAPM_SUPPLY ("VA MIC BIAS1" , SND_SOC_NOPM , MIC_BIAS_1 , 0 ,
23242306 wcd937x_codec_enable_micbias_pullup ,
23252307 SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
23262308 SND_SOC_DAPM_POST_PMD ),
2327- SND_SOC_DAPM_SUPPLY ("VA MIC BIAS2" , SND_SOC_NOPM , 0 , 0 ,
2309+ SND_SOC_DAPM_SUPPLY ("VA MIC BIAS2" , SND_SOC_NOPM , MIC_BIAS_2 , 0 ,
23282310 wcd937x_codec_enable_micbias_pullup ,
23292311 SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
23302312 SND_SOC_DAPM_POST_PMD ),
2331- SND_SOC_DAPM_SUPPLY ("VA MIC BIAS3" , SND_SOC_NOPM , 0 , 0 ,
2313+ SND_SOC_DAPM_SUPPLY ("VA MIC BIAS3" , SND_SOC_NOPM , MIC_BIAS_3 , 0 ,
23322314 wcd937x_codec_enable_micbias_pullup ,
23332315 SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
23342316 SND_SOC_DAPM_POST_PMD ),
0 commit comments