diff options
| author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2013-03-27 10:49:40 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-04-08 15:21:02 +0200 |
| commit | 12bb68ed459e52187c7e70cb6dd4bfcc672cc171 (patch) | |
| tree | 10d5a0e0e6f48621e02ebdfdc3eaed557a2dc020 /drivers/mfd/arizona-core.c | |
| parent | mfd: arizona: Add a hardware patch mechanism (diff) | |
| download | linux-12bb68ed459e52187c7e70cb6dd4bfcc672cc171.tar.xz linux-12bb68ed459e52187c7e70cb6dd4bfcc672cc171.zip | |
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>
Diffstat (limited to 'drivers/mfd/arizona-core.c')
| -rw-r--r-- | drivers/mfd/arizona-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index d6b40df64c4a..7d1abe7ce83f 100644 --- 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; } |