Browse Source

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>
Charles Keepax 12 years ago
parent
commit
12bb68ed45
1 changed files with 5 additions and 5 deletions
  1. 5 5
      drivers/mfd/arizona-core.c

+ 5 - 5
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;
 	}