Skip to content

Commit

Permalink
mfd: wm5102: Deactivate standard boot sequence
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Charles Keepax authored and Samuel Ortiz committed Apr 8, 2013
1 parent e80436b commit 12bb68e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/mfd/arizona-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}

Expand Down

0 comments on commit 12bb68e

Please sign in to comment.