From 0ddab763da29e83e0f4443ed91d6c3bb8e4651eb Mon Sep 17 00:00:00 2001
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Date: Wed, 3 Apr 2013 12:53:37 +0100
Subject: [PATCH] --- yaml --- r: 373201 b: refs/heads/master c:
 c25feaa53cca696321540ca0f8564bf484224cac h: refs/heads/master i:   373199:
 fef85c2e9598216b567cd421aca3d00259ffd89f v: v3

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

diff --git a/[refs] b/[refs]
index 93cf363b73aa..e7b3e4b8b073 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87d3af4ac0554afc2e86069d7578f74b12f3f67a
+refs/heads/master: c25feaa53cca696321540ca0f8564bf484224cac
diff --git a/trunk/drivers/mfd/arizona-core.c b/trunk/drivers/mfd/arizona-core.c
index ae10af798843..41856b4c0d17 100644
--- a/trunk/drivers/mfd/arizona-core.c
+++ b/trunk/drivers/mfd/arizona-core.c
@@ -529,8 +529,10 @@ int arizona_dev_init(struct arizona *arizona)
 		goto err_enable;
 	}
 
-	if (arizona->pdata.reset)
+	if (arizona->pdata.reset) {
 		gpio_set_value_cansleep(arizona->pdata.reset, 1);
+		msleep(1);
+	}
 
 	regcache_cache_only(arizona->regmap, false);
 
@@ -589,6 +591,8 @@ int arizona_dev_init(struct arizona *arizona)
 			goto err_reset;
 		}
 
+		msleep(1);
+
 		ret = regcache_sync(arizona->regmap);
 		if (ret != 0) {
 			dev_err(dev, "Failed to sync device: %d\n", ret);