diff options
author | Charles Keepax <ckeepax@opensource.wolfsonmicro.com> | 2013-08-07 07:17:14 -0400 |
---|---|---|
committer | Chanwoo Choi <cw00.choi@samsung.com> | 2013-09-26 20:37:00 -0400 |
commit | cb9005d7dacb83ba92f39fe6d2a9c0c06ca50cb3 (patch) | |
tree | 76ff6c7f9c9ddb84fb346c6f936c8479d2cf4002 /drivers/extcon | |
parent | ad07d8b489b07510d98773472d2a3023701f88b6 (diff) |
extcon: arizona: Clear trig_sts bits on all paths
We want the trig_sts bits to be cleared in all cases where we consider
the jack detection interrupt to have been handled. Specifically, if a
duplicate detection event was suppressed these bits were not cleared
causing the CODEC to not enter a low power state. This patch clears the
bits on the duplicate detection code path.
Reported-by: Ryo Tsutsui <ryo.tsutsui@wolfsonmicro.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers/extcon')
-rw-r--r-- | drivers/extcon/extcon-arizona.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index e55713083c78..4696df0946ed 100644 --- a/drivers/extcon/extcon-arizona.c +++ b/drivers/extcon/extcon-arizona.c | |||
@@ -1039,6 +1039,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data) | |||
1039 | else | 1039 | else |
1040 | info->micd_timeout = DEFAULT_MICD_TIMEOUT; | 1040 | info->micd_timeout = DEFAULT_MICD_TIMEOUT; |
1041 | 1041 | ||
1042 | out: | ||
1042 | /* Clear trig_sts to make sure DCVDD is not forced up */ | 1043 | /* Clear trig_sts to make sure DCVDD is not forced up */ |
1043 | regmap_write(arizona->regmap, ARIZONA_AOD_WKUP_AND_TRIG, | 1044 | regmap_write(arizona->regmap, ARIZONA_AOD_WKUP_AND_TRIG, |
1044 | ARIZONA_MICD_CLAMP_FALL_TRIG_STS | | 1045 | ARIZONA_MICD_CLAMP_FALL_TRIG_STS | |
@@ -1046,7 +1047,6 @@ static irqreturn_t arizona_jackdet(int irq, void *data) | |||
1046 | ARIZONA_JD1_FALL_TRIG_STS | | 1047 | ARIZONA_JD1_FALL_TRIG_STS | |
1047 | ARIZONA_JD1_RISE_TRIG_STS); | 1048 | ARIZONA_JD1_RISE_TRIG_STS); |
1048 | 1049 | ||
1049 | out: | ||
1050 | mutex_unlock(&info->lock); | 1050 | mutex_unlock(&info->lock); |
1051 | 1051 | ||
1052 | pm_runtime_mark_last_busy(info->dev); | 1052 | pm_runtime_mark_last_busy(info->dev); |