From 26573e33432325b25dcd1882a0c816963b4b8472 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 10 Nov 2011 16:14:04 +0000
Subject: [PATCH] --- yaml --- r: 283711 b: refs/heads/master c:
 d9b5e9c6bccc3850b91ddaac11b49f2510375f5b h: refs/heads/master i:   283709:
 7797ed4c35eb7ef7fec744664f8115fce14bbf2c   283707:
 19cc6e57ffee138044aef8df7852bc6f11be32c6   283703:
 9cc041e4d65a8d75e58a257d40d81498c8ca73ce   283695:
 4e25dfe0fa99a887cc6ab9ca05ea49dd0512a8d3   283679:
 76b2663f330d37668638b49c891050c92dc99bc4   283647:
 0f6bd03ff7bf17559d83c7e77465fddab0e3fb05 v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/codecs/wm5100.c | 36 ++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index e336d5c15cf9..7bf9c5412229 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9016a7937122b72d87ff2037664b7bd717d3e4b
+refs/heads/master: d9b5e9c6bccc3850b91ddaac11b49f2510375f5b
diff --git a/trunk/sound/soc/codecs/wm5100.c b/trunk/sound/soc/codecs/wm5100.c
index 0077086d8e5b..f37d67f4058b 100644
--- a/trunk/sound/soc/codecs/wm5100.c
+++ b/trunk/sound/soc/codecs/wm5100.c
@@ -2467,24 +2467,6 @@ static int wm5100_probe(struct snd_soc_codec *codec)
 		snd_soc_update_bits(codec, wm5100_dig_vu[i], WM5100_OUT_VU,
 				    WM5100_OUT_VU);
 
-	for (i = 0; i < ARRAY_SIZE(wm5100->pdata.in_mode); i++) {
-		snd_soc_update_bits(codec, WM5100_IN1L_CONTROL,
-				    WM5100_IN1_MODE_MASK |
-				    WM5100_IN1_DMIC_SUP_MASK,
-				    (wm5100->pdata.in_mode[i] <<
-				     WM5100_IN1_MODE_SHIFT) |
-				    (wm5100->pdata.dmic_sup[i] <<
-				     WM5100_IN1_DMIC_SUP_SHIFT));
-	}
-
-	for (i = 0; i < ARRAY_SIZE(wm5100->pdata.gpio_defaults); i++) {
-		if (!wm5100->pdata.gpio_defaults[i])
-			continue;
-
-		snd_soc_write(codec, WM5100_GPIO_CTRL_1 + i,
-			      wm5100->pdata.gpio_defaults[i]);
-	}
-
 	/* Don't debounce interrupts to support use of SYSCLK only */
 	snd_soc_write(codec, WM5100_IRQ_DEBOUNCE_1, 0);
 	snd_soc_write(codec, WM5100_IRQ_DEBOUNCE_2, 0);
@@ -2739,6 +2721,24 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c,
 
 	wm5100_init_gpio(i2c);
 
+	for (i = 0; i < ARRAY_SIZE(wm5100->pdata.gpio_defaults); i++) {
+		if (!wm5100->pdata.gpio_defaults[i])
+			continue;
+
+		regmap_write(wm5100->regmap, WM5100_GPIO_CTRL_1 + i,
+			     wm5100->pdata.gpio_defaults[i]);
+	}
+
+	for (i = 0; i < ARRAY_SIZE(wm5100->pdata.in_mode); i++) {
+		regmap_update_bits(wm5100->regmap, WM5100_IN1L_CONTROL,
+				   WM5100_IN1_MODE_MASK |
+				   WM5100_IN1_DMIC_SUP_MASK,
+				   (wm5100->pdata.in_mode[i] <<
+				    WM5100_IN1_MODE_SHIFT) |
+				   (wm5100->pdata.dmic_sup[i] <<
+				    WM5100_IN1_DMIC_SUP_SHIFT));
+	}
+
 	ret = snd_soc_register_codec(&i2c->dev,
 				     &soc_codec_dev_wm5100, wm5100_dai,
 				     ARRAY_SIZE(wm5100_dai));