summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2015-04-30 23:43:37 +0900
committerChanwoo Choi <cw00.choi@samsung.com>2015-05-19 16:39:05 +0900
commit2b51f9c2f1bd43907e1dc75912de6f06c6f59860 (patch)
tree9f80f0660c15f6dc3bb41e1b056e64fff620b275
parenta71fbc1525c4fbe894c52256404575c5f697c571 (diff)
downloadlinux-stable-2b51f9c2f1bd43907e1dc75912de6f06c6f59860.tar.gz
linux-stable-2b51f9c2f1bd43907e1dc75912de6f06c6f59860.tar.bz2
linux-stable-2b51f9c2f1bd43907e1dc75912de6f06c6f59860.zip
extcon: arizona: Apply HP clamps correctly for WM8280
The headphone clamping is not set correctly currently, this was missed because the wm8280 patches and the patch fixing the clamping for wm5110 went upstream at very similar times. This patch sets the headphone clamping correctly for wm8280. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
-rw-r--r--drivers/extcon/extcon-arizona.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 50975b3123d6..5e08c358649b 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -145,6 +145,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
switch (arizona->type) {
case WM5110:
+ case WM8280:
mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
ARIZONA_HP1L_SHRTI;
if (clamp)