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 d6b40df64c4ab4daeecc2282ab9e011a11a85930..7d1abe7ce83f020e1b508d5afaa253d5c8321172 100644 (file)
--- 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;
        }