lkml.org 
[lkml]   [2015]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/5] mfd: wm5102: Move check for custom boot into arizona_wait_for_boot
Date
It is better to have the arizona_wait_for_boot function behave sensibly
for all devices rather than having to have special handling outside of
it for wm5102. As such move the code which checks for wm5102's custom
boot into arizona_wait_for_boot, essentially making it a no-op on wm5102
once the custom boot is activated.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/mfd/arizona-core.c | 54 +++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index f0dbaa6..aaaecaa 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -232,6 +232,23 @@ static int arizona_poll_reg(struct arizona *arizona,
static int arizona_wait_for_boot(struct arizona *arizona)
{
int ret;
+ unsigned int val;
+
+ /* Check for wm5102 custom boot */
+ switch (arizona->type) {
+ case WM5102:
+ ret = regmap_read(arizona->regmap,
+ ARIZONA_WRITE_SEQUENCER_CTRL_3, &val);
+ if (ret)
+ dev_err(arizona->dev,
+ "Failed to check write sequencer state: %d\n",
+ ret);
+ else if (val & 0x01)
+ return 0;
+ break;
+ default:
+ break;
+ }

/*
* We can't use an interrupt as we need to runtime resume to do so,
@@ -419,6 +436,10 @@ static int arizona_runtime_resume(struct device *dev)

regcache_cache_only(arizona->regmap, false);

+ ret = arizona_wait_for_boot(arizona);
+ if (ret)
+ goto err;
+
switch (arizona->type) {
case WM5102:
if (arizona->external_dcvdd) {
@@ -449,10 +470,6 @@ static int arizona_runtime_resume(struct device *dev)
break;
case WM5110:
case WM8280:
- ret = arizona_wait_for_boot(arizona);
- if (ret)
- goto err;
-
if (arizona->external_dcvdd) {
ret = regmap_update_bits(arizona->regmap,
ARIZONA_ISOLATION_CONTROL,
@@ -479,11 +496,6 @@ static int arizona_runtime_resume(struct device *dev)
}
break;
default:
- ret = arizona_wait_for_boot(arizona);
- if (ret != 0) {
- goto err;
- }
-
if (arizona->external_dcvdd) {
ret = regmap_update_bits(arizona->regmap,
ARIZONA_ISOLATION_CONTROL,
@@ -920,25 +932,11 @@ int arizona_dev_init(struct arizona *arizona)
}

/* Ensure device startup is complete */
- switch (arizona->type) {
- case WM5102:
- ret = regmap_read(arizona->regmap,
- ARIZONA_WRITE_SEQUENCER_CTRL_3, &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;
+ ret = arizona_wait_for_boot(arizona);
+ if (ret) {
+ dev_err(arizona->dev,
+ "Device failed initial boot: %d\n", ret);
+ goto err_reset;
}

/* Read the device ID information & do device specific stuff */
--
1.7.2.5


\
 
 \ /
  Last update: 2015-03-24 16:21    [W:0.061 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site