Skip to contentSkip to conversation

extcon: arizona: Add support for WM8998 and WM1814

PATCH In review Richard Fitzgerald 2 participants 3 messages Sep 28, 2015 – Sep 29, 2015 External connector subsystem (extcon)

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 extcon: arizona: Add support for WM8998 and WM1814

In reply to Richard Fitzgerald

This patch adds support for the WM8998 and WM1814 codecs. These use the same IP version as WM5110 but have different clamp control.

---
 drivers/extcon/extcon-arizona.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
drivers/extcon/extcon-arizona.c +21 -10
index 4479781..b010307 100644
@@ -1,7 +1,7 @@
 /*
  * extcon-arizona.c - Extcon driver Wolfson Arizona devices
  *
- *  Copyright (C) 2012 Wolfson Microelectronics plc
+ *  Copyright (C) 2012-2014 Wolfson Microelectronics plc
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -154,6 +154,10 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
 	int ret;
 
 	switch (arizona->type) {
+	case WM8998:
+	case WM1814:
+		mask = 0;
+		break;
 	case WM5110:
 	case WM8280:
 		mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
@@ -197,17 +201,19 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
 				 ret);
 	}
 
-	ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1L,
-				 mask, val);
-	if (ret != 0)
-		dev_warn(arizona->dev, "Failed to do clamp: %d\n",
+	if (mask) {
+		ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1L,
+					 mask, val);
+		if (ret != 0)
+			dev_warn(arizona->dev, "Failed to do clamp: %d\n",
 				 ret);
 
-	ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1R,
-				 mask, val);
-	if (ret != 0)
-		dev_warn(arizona->dev, "Failed to do clamp: %d\n",
-			 ret);
+		ret = regmap_update_bits(arizona->regmap, ARIZONA_HP_CTRL_1R,
+					 mask, val);
+		if (ret != 0)
+			dev_warn(arizona->dev, "Failed to do clamp: %d\n",
+				 ret);
+	}
 
 	/* Restore the desired state while not doing the clamp */
 	if (!clamp) {
@@ -1289,6 +1295,11 @@ static int arizona_extcon_probe(struct platform_device *pdev)
 			break;
 		}
 		break;
+	case WM8998:
+	case WM1814:
+		info->micd_clamp = true;
+		info->hpdet_ip_version = 2;
+		break;
 	default:
 		break;
 	}
Signature · 1 line
1.9.1
#0 lore raw

cover extcon: arizona: Add support for WM8998 and WM1814

This patch is based on top of Chanwoo's ib-extcon-mfd-4.4 which contains recent patches from Charles Keepax to extcon-arizona.

Richard Fitzgerald (1):
extcon: arizona: Add support for WM8998 and WM1814

 drivers/extcon/extcon-arizona.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
Signature · 1 line
1.9.1
#2 lore raw
In reply to Richard Fitzgerald

Hi Richard,

Quoted 9 lines · Richard Fitzgerald

This patch adds support for the WM8998 and WM1814 codecs. These use the same IP version as WM5110 but have different clamp control.

---
 drivers/extcon/extcon-arizona.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

Applied it.

Thanks,
Chanwoo Choi