From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Date: Wed, 27 Mar 2013 09:49:40 +0000 (+0000)
Subject: mfd: wm5102: Deactivate standard boot sequence
X-Git-Tag: v4.14-rc1~9800^2~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12bb68ed459e52187c7e70cb6dd4bfcc672cc171;p=platform%2Fkernel%2Flinux-rpi.git

mfd: wm5102: Deactivate standard boot sequence

This patch deactivates the standard, currently noop, boot sequence
because we now have facilities in place for running a custom boot
sequence.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index d6b40df64c4a..7d1abe7ce83f 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -342,11 +342,6 @@ static int arizona_runtime_resume(struct device *dev)
 
 	regcache_cache_only(arizona->regmap, false);
 
-	ret = arizona_wait_for_boot(arizona);
-	if (ret != 0) {
-		goto err;
-	}
-
 	switch (arizona->type) {
 	case WM5102:
 		ret = wm5102_patch(arizona);
@@ -365,6 +360,11 @@ static int arizona_runtime_resume(struct device *dev)
 		}
 		break;
 	default:
+		ret = arizona_wait_for_boot(arizona);
+		if (ret != 0) {
+			goto err;
+		}
+
 		break;
 	}