Commit e7811147 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Lee Jones

mfd: arizona: Factor out DCVDD isolation control

Currently DCVDD isolation is enabled and disabled for
runtime_suspend and runtime_resume. Future codecs will not
have the isolation control so to prepare for these codecs
this patch factors out the isolation control allowing it to
be called as needed in the existing codec-specific switch cases.
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 18eb3f04
...@@ -460,6 +460,33 @@ static int wm5102_clear_write_sequencer(struct arizona *arizona) ...@@ -460,6 +460,33 @@ static int wm5102_clear_write_sequencer(struct arizona *arizona)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int arizona_isolate_dcvdd(struct arizona *arizona)
{
int ret;
ret = regmap_update_bits(arizona->regmap,
ARIZONA_ISOLATION_CONTROL,
ARIZONA_ISOLATE_DCVDD1,
ARIZONA_ISOLATE_DCVDD1);
if (ret != 0)
dev_err(arizona->dev, "Failed to isolate DCVDD: %d\n", ret);
return ret;
}
static int arizona_connect_dcvdd(struct arizona *arizona)
{
int ret;
ret = regmap_update_bits(arizona->regmap,
ARIZONA_ISOLATION_CONTROL,
ARIZONA_ISOLATE_DCVDD1, 0);
if (ret != 0)
dev_err(arizona->dev, "Failed to connect DCVDD: %d\n", ret);
return ret;
}
static int arizona_runtime_resume(struct device *dev) static int arizona_runtime_resume(struct device *dev)
{ {
struct arizona *arizona = dev_get_drvdata(dev); struct arizona *arizona = dev_get_drvdata(dev);
...@@ -499,14 +526,9 @@ static int arizona_runtime_resume(struct device *dev) ...@@ -499,14 +526,9 @@ static int arizona_runtime_resume(struct device *dev)
switch (arizona->type) { switch (arizona->type) {
case WM5102: case WM5102:
if (arizona->external_dcvdd) { if (arizona->external_dcvdd) {
ret = regmap_update_bits(arizona->regmap, ret = arizona_connect_dcvdd(arizona);
ARIZONA_ISOLATION_CONTROL, if (ret != 0)
ARIZONA_ISOLATE_DCVDD1, 0);
if (ret != 0) {
dev_err(arizona->dev,
"Failed to connect DCVDD: %d\n", ret);
goto err; goto err;
}
} }
ret = wm5102_patch(arizona); ret = wm5102_patch(arizona);
...@@ -531,14 +553,9 @@ static int arizona_runtime_resume(struct device *dev) ...@@ -531,14 +553,9 @@ static int arizona_runtime_resume(struct device *dev)
goto err; goto err;
if (arizona->external_dcvdd) { if (arizona->external_dcvdd) {
ret = regmap_update_bits(arizona->regmap, ret = arizona_connect_dcvdd(arizona);
ARIZONA_ISOLATION_CONTROL, if (ret != 0)
ARIZONA_ISOLATE_DCVDD1, 0);
if (ret) {
dev_err(arizona->dev,
"Failed to connect DCVDD: %d\n", ret);
goto err; goto err;
}
} else { } else {
/* /*
* As this is only called for the internal regulator * As this is only called for the internal regulator
...@@ -569,14 +586,9 @@ static int arizona_runtime_resume(struct device *dev) ...@@ -569,14 +586,9 @@ static int arizona_runtime_resume(struct device *dev)
goto err; goto err;
if (arizona->external_dcvdd) { if (arizona->external_dcvdd) {
ret = regmap_update_bits(arizona->regmap, ret = arizona_connect_dcvdd(arizona);
ARIZONA_ISOLATION_CONTROL, if (ret != 0)
ARIZONA_ISOLATE_DCVDD1, 0);
if (ret != 0) {
dev_err(arizona->dev,
"Failed to connect DCVDD: %d\n", ret);
goto err; goto err;
}
} }
break; break;
} }
...@@ -609,37 +621,36 @@ static int arizona_runtime_suspend(struct device *dev) ...@@ -609,37 +621,36 @@ static int arizona_runtime_suspend(struct device *dev)
return ret; return ret;
} }
if (arizona->external_dcvdd) {
ret = regmap_update_bits(arizona->regmap,
ARIZONA_ISOLATION_CONTROL,
ARIZONA_ISOLATE_DCVDD1,
ARIZONA_ISOLATE_DCVDD1);
if (ret != 0) {
dev_err(arizona->dev, "Failed to isolate DCVDD: %d\n",
ret);
return ret;
}
}
switch (arizona->type) { switch (arizona->type) {
case WM5110: case WM5110:
case WM8280: case WM8280:
if (arizona->external_dcvdd) if (arizona->external_dcvdd) {
break; ret = arizona_isolate_dcvdd(arizona);
if (ret != 0)
/* return ret;
* As this is only called for the internal regulator } else {
* (where we know voltage ranges available) it is ok /*
* to request an exact range. * As this is only called for the internal regulator
*/ * (where we know voltage ranges available) it is ok
ret = regulator_set_voltage(arizona->dcvdd, 1175000, 1175000); * to request an exact range.
if (ret < 0) { */
dev_err(arizona->dev, ret = regulator_set_voltage(arizona->dcvdd,
"Failed to set suspend voltage: %d\n", ret); 1175000, 1175000);
return ret; if (ret < 0) {
dev_err(arizona->dev,
"Failed to set suspend voltage: %d\n",
ret);
return ret;
}
} }
break; break;
case WM5102: case WM5102:
if (arizona->external_dcvdd) {
ret = arizona_isolate_dcvdd(arizona);
if (ret != 0)
return ret;
}
if (!(val & ARIZONA_JD1_ENA)) { if (!(val & ARIZONA_JD1_ENA)) {
ret = regmap_write(arizona->regmap, ret = regmap_write(arizona->regmap,
ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0); ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0);
...@@ -652,6 +663,11 @@ static int arizona_runtime_suspend(struct device *dev) ...@@ -652,6 +663,11 @@ static int arizona_runtime_suspend(struct device *dev)
} }
break; break;
default: default:
if (arizona->external_dcvdd) {
ret = arizona_isolate_dcvdd(arizona);
if (ret != 0)
return ret;
}
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment