summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 05:35:27 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 05:35:27 +0100
commite110850468bff1b0c438503429c492aa7d8a9995 (patch)
tree921eed4dabbcaac5c8110607e04a0304520c52a5 /sound
parentMerge remote-tracking branch 'asoc/topic/wm8971' into asoc-next (diff)
parentASoC: wm8978: Remove remuxing of GPIO1 pin (diff)
downloadlinux-e110850468bff1b0c438503429c492aa7d8a9995.tar.xz
linux-e110850468bff1b0c438503429c492aa7d8a9995.zip
Merge remote-tracking branch 'asoc/topic/wm8978' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8978.c3
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)
return idx;
wm8978->mclk_idx = idx;
-
- /* GPIO1 into default mode as input - before configuring PLL */
- snd_soc_update_bits(codec, WM8978_GPIO_CONTROL, 7, 0);
} else {
return -EINVAL;
}