diff options
| author | Charles Keepax | 2013-04-03 10:45:29 +0200 |
|---|---|---|
| committer | Samuel Ortiz | 2013-04-08 15:21:03 +0200 |
| commit | d955cba86d32e9b4b6fe7611b4c41b7bbe286183 (patch) | |
| tree | d821c5002ac3e49516a805560582f095931c0f26 /drivers/mfd/arizona-core.c | |
| parent | mfd: arizona: Wait for internal clocks to startup after reset (diff) | |
| download | kernel-qcow2-linux-d955cba86d32e9b4b6fe7611b4c41b7bbe286183.tar.gz kernel-qcow2-linux-d955cba86d32e9b4b6fe7611b4c41b7bbe286183.tar.xz kernel-qcow2-linux-d955cba86d32e9b4b6fe7611b4c41b7bbe286183.zip | |
mfd: wm5102: Don't wait for boot when boot sequencer is disabled
As we are using a custom boot sequence we don't need to wait for the
standard boot sequence in device init when the normal write sequence is
disabled.
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 | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 41856b4c0d17..6ab03043fd60 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -600,10 +600,24 @@ int arizona_dev_init(struct arizona *arizona) } } - ret = arizona_wait_for_boot(arizona); - if (ret != 0) { - dev_err(arizona->dev, "Device failed initial boot: %d\n", ret); - goto err_reset; + switch (arizona->type) { + case WM5102: + ret = regmap_read(arizona->regmap, 0x19, &val); + if (ret != 0) + dev_err(dev, + "Failed to check write sequencer state: %d\n", + ret); + else if (val & 0x01) + break; + /* Fall through */ + default: + ret = arizona_wait_for_boot(arizona); + if (ret != 0) { + dev_err(arizona->dev, + "Device failed initial boot: %d\n", ret); + goto err_reset; + } + break; } if (apply_patch) { |