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

mfd: arizona: Factor out checking of jack detection state

Currently runtime_suspend will fully power off the codec if
the jack detection is not enabled. Not all future codecs will
have jack detection so to prepare for these codecs this patch
factors out the check so that it 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 e7811147
...@@ -487,6 +487,23 @@ static int arizona_connect_dcvdd(struct arizona *arizona) ...@@ -487,6 +487,23 @@ static int arizona_connect_dcvdd(struct arizona *arizona)
return ret; return ret;
} }
static int arizona_is_jack_det_active(struct arizona *arizona)
{
unsigned int val;
int ret;
ret = regmap_read(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, &val);
if (ret) {
dev_err(arizona->dev,
"Failed to check jack det status: %d\n", ret);
return ret;
} else if (val & ARIZONA_JD1_ENA) {
return 1;
} else {
return 0;
}
}
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);
...@@ -610,20 +627,18 @@ static int arizona_runtime_resume(struct device *dev) ...@@ -610,20 +627,18 @@ static int arizona_runtime_resume(struct device *dev)
static int arizona_runtime_suspend(struct device *dev) static int arizona_runtime_suspend(struct device *dev)
{ {
struct arizona *arizona = dev_get_drvdata(dev); struct arizona *arizona = dev_get_drvdata(dev);
unsigned int val; unsigned int jd_active = 0;
int ret; int ret;
dev_dbg(arizona->dev, "Entering AoD mode\n"); dev_dbg(arizona->dev, "Entering AoD mode\n");
ret = regmap_read(arizona->regmap, ARIZONA_JACK_DETECT_ANALOGUE, &val);
if (ret) {
dev_err(dev, "Failed to check jack det status: %d\n", ret);
return ret;
}
switch (arizona->type) { switch (arizona->type) {
case WM5110: case WM5110:
case WM8280: case WM8280:
jd_active = arizona_is_jack_det_active(arizona);
if (jd_active < 0)
return jd_active;
if (arizona->external_dcvdd) { if (arizona->external_dcvdd) {
ret = arizona_isolate_dcvdd(arizona); ret = arizona_isolate_dcvdd(arizona);
if (ret != 0) if (ret != 0)
...@@ -645,13 +660,17 @@ static int arizona_runtime_suspend(struct device *dev) ...@@ -645,13 +660,17 @@ static int arizona_runtime_suspend(struct device *dev)
} }
break; break;
case WM5102: case WM5102:
jd_active = arizona_is_jack_det_active(arizona);
if (jd_active < 0)
return jd_active;
if (arizona->external_dcvdd) { if (arizona->external_dcvdd) {
ret = arizona_isolate_dcvdd(arizona); ret = arizona_isolate_dcvdd(arizona);
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
if (!(val & ARIZONA_JD1_ENA)) { if (!jd_active) {
ret = regmap_write(arizona->regmap, ret = regmap_write(arizona->regmap,
ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0); ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0);
if (ret) { if (ret) {
...@@ -663,6 +682,10 @@ static int arizona_runtime_suspend(struct device *dev) ...@@ -663,6 +682,10 @@ static int arizona_runtime_suspend(struct device *dev)
} }
break; break;
default: default:
jd_active = arizona_is_jack_det_active(arizona);
if (jd_active < 0)
return jd_active;
if (arizona->external_dcvdd) { if (arizona->external_dcvdd) {
ret = arizona_isolate_dcvdd(arizona); ret = arizona_isolate_dcvdd(arizona);
if (ret != 0) if (ret != 0)
...@@ -676,7 +699,7 @@ static int arizona_runtime_suspend(struct device *dev) ...@@ -676,7 +699,7 @@ static int arizona_runtime_suspend(struct device *dev)
regulator_disable(arizona->dcvdd); regulator_disable(arizona->dcvdd);
/* Allow us to completely power down if no jack detection */ /* Allow us to completely power down if no jack detection */
if (!(val & ARIZONA_JD1_ENA)) { if (!jd_active) {
dev_dbg(arizona->dev, "Fully powering off\n"); dev_dbg(arizona->dev, "Fully powering off\n");
arizona->has_fully_powered_off = true; arizona->has_fully_powered_off = true;
......
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