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);