From 045c32e21b360f5ec80c123bb0282c3cf31775e7 Mon Sep 17 00:00:00 2001
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Date: Wed, 3 Apr 2013 09:45:29 +0100
Subject: [PATCH] --- yaml --- r: 373202 b: refs/heads/master c:
 d955cba86d32e9b4b6fe7611b4c41b7bbe286183 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/mfd/arizona-core.c | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e7b3e4b8b073..44dc3e646ff0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c25feaa53cca696321540ca0f8564bf484224cac
+refs/heads/master: d955cba86d32e9b4b6fe7611b4c41b7bbe286183
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index 41856b4c0d17..6ab03043fd60 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -600,10 +600,24 @@ int arizona_dev_init(struct arizona *arizona)
 		}
 	}
 
-	ret = arizona_wait_for_boot(arizona);
-	if (ret != 0) {
-		dev_err(arizona->dev, "Device failed initial boot: %d\n", ret);
-		goto err_reset;
+	switch (arizona->type) {
+	case WM5102:
+		ret = regmap_read(arizona->regmap, 0x19, &val);
+		if (ret != 0)
+			dev_err(dev,
+				"Failed to check write sequencer state: %d\n",
+				ret);
+		else if (val & 0x01)
+			break;
+		/* Fall through */
+	default:
+		ret = arizona_wait_for_boot(arizona);
+		if (ret != 0) {
+			dev_err(arizona->dev,
+				"Device failed initial boot: %d\n", ret);
+			goto err_reset;
+		}
+		break;
 	}
 
 	if (apply_patch) {