diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:27 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:27 -0500 |
| commit | e110850468bff1b0c438503429c492aa7d8a9995 (patch) | |
| tree | 921eed4dabbcaac5c8110607e04a0304520c52a5 /sound/soc | |
| parent | efffa4e21bc0959ddb91fea5d04ed1eab4a2990a (diff) | |
| parent | 978545e7b1a9d114eccd291dd0caf1d437b49f24 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8978' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8978.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 4c0a8e496131..8c1dac946f62 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
| @@ -527,9 +527,6 @@ static int wm8978_configure_pll(struct snd_soc_codec *codec) | |||
| 527 | return idx; | 527 | return idx; |
| 528 | 528 | ||
| 529 | wm8978->mclk_idx = idx; | 529 | wm8978->mclk_idx = idx; |
| 530 | |||
| 531 | /* GPIO1 into default mode as input - before configuring PLL */ | ||
| 532 | snd_soc_update_bits(codec, WM8978_GPIO_CONTROL, 7, 0); | ||
| 533 | } else { | 530 | } else { |
| 534 | return -EINVAL; | 531 | return -EINVAL; |
| 535 | } | 532 | } |