diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-12-22 05:47:21 -0500 |
|---|---|---|
| committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-01-26 08:40:43 -0500 |
| commit | 778cee7afd063b1321dd9a2d2ecd8822d76bb33a (patch) | |
| tree | de91926882b22e54dcc53ce96eba256ce3e64d51 /sound/soc/codecs/twl6040.c | |
| parent | d1be1d2fd1158b45dca99e3924621e1068c87b82 (diff) | |
ASoC: twl6040: Convert MICBIAS to SUPPLY widget
In order to avoid breakage change the omap-abe-twl6040
machine driver's routing.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/twl6040.c')
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 284dd2e99971..1a64edf671a2 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c | |||
| @@ -1138,14 +1138,14 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { | |||
| 1138 | TWL6040_REG_MICRCTL, 2, 0), | 1138 | TWL6040_REG_MICRCTL, 2, 0), |
| 1139 | 1139 | ||
| 1140 | /* Microphone bias */ | 1140 | /* Microphone bias */ |
| 1141 | SND_SOC_DAPM_MICBIAS("Headset Mic Bias", | 1141 | SND_SOC_DAPM_SUPPLY("Headset Mic Bias", |
| 1142 | TWL6040_REG_AMICBCTL, 0, 0), | 1142 | TWL6040_REG_AMICBCTL, 0, 0, NULL, 0), |
| 1143 | SND_SOC_DAPM_MICBIAS("Main Mic Bias", | 1143 | SND_SOC_DAPM_SUPPLY("Main Mic Bias", |
| 1144 | TWL6040_REG_AMICBCTL, 4, 0), | 1144 | TWL6040_REG_AMICBCTL, 4, 0, NULL, 0), |
| 1145 | SND_SOC_DAPM_MICBIAS("Digital Mic1 Bias", | 1145 | SND_SOC_DAPM_SUPPLY("Digital Mic1 Bias", |
| 1146 | TWL6040_REG_DMICBCTL, 0, 0), | 1146 | TWL6040_REG_DMICBCTL, 0, 0, NULL, 0), |
| 1147 | SND_SOC_DAPM_MICBIAS("Digital Mic2 Bias", | 1147 | SND_SOC_DAPM_SUPPLY("Digital Mic2 Bias", |
| 1148 | TWL6040_REG_DMICBCTL, 4, 0), | 1148 | TWL6040_REG_DMICBCTL, 4, 0, NULL, 0), |
| 1149 | 1149 | ||
| 1150 | /* DACs */ | 1150 | /* DACs */ |
| 1151 | SND_SOC_DAPM_DAC("HSDAC Left", "Headset Playback", SND_SOC_NOPM, 0, 0), | 1151 | SND_SOC_DAPM_DAC("HSDAC Left", "Headset Playback", SND_SOC_NOPM, 0, 0), |