diff options
Diffstat (limited to 'sound/soc/codecs/ab8500-codec.c')
-rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 07abd09e0b1d..af547490b4f7 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c | |||
@@ -391,10 +391,10 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = { | |||
391 | SND_SOC_DAPM_CLOCK_SUPPLY("audioclk"), | 391 | SND_SOC_DAPM_CLOCK_SUPPLY("audioclk"), |
392 | 392 | ||
393 | /* Regulators */ | 393 | /* Regulators */ |
394 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-AUD", 0), | 394 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-AUD", 0, 0), |
395 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC1", 0), | 395 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC1", 0, 0), |
396 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC2", 0), | 396 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-AMIC2", 0, 0), |
397 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-DMIC", 0), | 397 | SND_SOC_DAPM_REGULATOR_SUPPLY("V-DMIC", 0, 0), |
398 | 398 | ||
399 | /* Power */ | 399 | /* Power */ |
400 | SND_SOC_DAPM_SUPPLY("Audio Power", | 400 | SND_SOC_DAPM_SUPPLY("Audio Power", |
@@ -2462,10 +2462,7 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) | |||
2462 | dev_dbg(dev, "%s: Enter.\n", __func__); | 2462 | dev_dbg(dev, "%s: Enter.\n", __func__); |
2463 | 2463 | ||
2464 | /* Setup AB8500 according to board-settings */ | 2464 | /* Setup AB8500 according to board-settings */ |
2465 | pdata = (struct ab8500_platform_data *)dev_get_platdata(dev->parent); | 2465 | pdata = dev_get_platdata(dev->parent); |
2466 | |||
2467 | /* Inform SoC Core that we have our own I/O arrangements. */ | ||
2468 | codec->control_data = (void *)true; | ||
2469 | 2466 | ||
2470 | if (np) { | 2467 | if (np) { |
2471 | if (!pdata) | 2468 | if (!pdata) |