Skip to contentSkip to conversation

mfd: Switch WM8350 revision detection to a feature based model

PATCH In review Mark Brown 2 participants 5 messages Nov 19, 2008 – Nov 24, 2008

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/2 mfd: Switch WM8350 revision detection to a feature based model

Rather than check for chip revisions in the WM8350 drivers have the core code set flags for relevant differences.

---
 drivers/mfd/wm8350-core.c         |   14 ++++++--------
 drivers/power/wm8350_power.c      |    2 +-
 include/linux/mfd/wm8350/core.h   |    8 --------
 include/linux/mfd/wm8350/supply.h |    2 ++
 4 files changed, 9 insertions(+), 17 deletions(-)
drivers/mfd/wm8350-core.c +6 -8
index 3f2a68d..84fc90e 100644
@@ -1238,21 +1238,19 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 
 	if (id1 == 0x6143) {
 		switch ((id2 & WM8350_CHIP_REV_MASK) >> 12) {
-		case WM8350_REV_E:
+		case 0x4:
 			dev_info(wm8350->dev, "Found Rev E device\n");
-			wm8350->rev = WM8350_REV_E;
 			break;
-		case WM8350_REV_F:
+		case 0x5:
 			dev_info(wm8350->dev, "Found Rev F device\n");
-			wm8350->rev = WM8350_REV_F;
 			break;
-		case WM8350_REV_G:
+		case 0x6:
 			dev_info(wm8350->dev, "Found Rev G device\n");
-			wm8350->rev = WM8350_REV_G;
+			wm8350->power.rev_g_coeff = 1;
 			break;
-		case WM8350_REV_H:
+		case 0x7:
 			dev_info(wm8350->dev, "Found Rev H device\n");
-			wm8350->rev = WM8350_REV_H;
+			wm8350->power.rev_g_coeff = 1;
 			break;
 		default:
 			/* For safety we refuse to run on unknown hardware */
drivers/power/wm8350_power.c +1 -1
index 9c0a847..74e7593 100644
@@ -44,7 +44,7 @@ static int wm8350_read_usb_uvolts(struct wm8350 *wm8350)
 
 static inline int wm8350_charge_time_min(struct wm8350 *wm8350, int min)
 {
-	if (wm8350->rev < WM8350_REV_G)
+	if (!wm8350->power.rev_g_coeff)
 		return (((min - 30) / 15) & 0xf) << 8;
 	else
 		return (((min - 30) / 30) & 0xf) << 8;
include/linux/mfd/wm8350/core.h +0 -8
index d2614df..8563408 100644
@@ -558,12 +558,6 @@
 #define WM8350_IRQ_WKUP_ONKEY			48
 #define WM8350_IRQ_WKUP_GP_WAKEUP		49
 
-/* wm8350 chip revisions */
-#define WM8350_REV_E				0x4
-#define WM8350_REV_F				0x5
-#define WM8350_REV_G				0x6
-#define WM8350_REV_H				0x7
-
 #define WM8350_NUM_IRQ				63
 
 struct wm8350_reg_access {
@@ -585,8 +579,6 @@ struct wm8350_irq {
 };
 
 struct wm8350 {
-	int rev;		/* chip revision */
-
 	struct device *dev;
 
 	/* device IO */
include/linux/mfd/wm8350/supply.h +2 -0
index 7972151..2b94793 100644
@@ -127,6 +127,8 @@ struct wm8350_power {
 	struct power_supply usb;
 	struct power_supply ac;
 	struct wm8350_charger_policy *policy;
+
+	int rev_g_coeff;
 };
 
 #endif
Signature · 1 line
1.5.6.5
author
#1 lore raw

PATCH 2/2 mfd: Refactor WM8350 chip identification

Since the WM8350 driver was originally written the semantics for the identification registers of the chip have been clarified, allowing us to do an exact match on all the fields. This avoids mistakenly running on unsupported hardware.

Also change to using the datasheet names more consistently for legibility and fix a printk() that should be dev_err().

---
 drivers/mfd/wm8350-core.c       |   54 ++++++++++++++++++++++++++------------
 include/linux/mfd/wm8350/core.h |    6 ++++
 2 files changed, 43 insertions(+), 17 deletions(-)
drivers/mfd/wm8350-core.c +37 -17
index 84fc90e..d7836ad 100644
@@ -1227,52 +1227,72 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 		       struct wm8350_platform_data *pdata)
 {
 	int ret = -EINVAL;
-	u16 id1, id2, mask, mode;
+	u16 id1, id2, mask_rev;
+	u16 cust_id, mode, chip_rev;
 
 	/* get WM8350 revision and config mode */
 	wm8350->read_dev(wm8350, WM8350_RESET_ID, sizeof(id1), &id1);
 	wm8350->read_dev(wm8350, WM8350_ID, sizeof(id2), &id2);
+	wm8350->read_dev(wm8350, WM8350_REVISION, sizeof(mask_rev), &mask_rev);
 
 	id1 = be16_to_cpu(id1);
 	id2 = be16_to_cpu(id2);
+	mask_rev = be16_to_cpu(mask_rev);
 
-	if (id1 == 0x6143) {
-		switch ((id2 & WM8350_CHIP_REV_MASK) >> 12) {
+	if (id1 != 0x6143) {
+		dev_err(wm8350->dev,
+			"Device with ID %x is not a WM8350\n", id1);
+		ret = -ENODEV;
+		goto err;
+	}
+
+	mode = id2 & WM8350_CONF_STS_MASK >> 10;
+	cust_id = id2 & WM8350_CUST_ID_MASK;
+	chip_rev = (id2 & WM8350_CHIP_REV_MASK) >> 12;
+	dev_info(wm8350->dev,
+		 "CONF_STS %d, CUST_ID %d, MASK_REV %d, CHIP_REV %d\n",
+		 mode, cust_id, mask_rev, chip_rev);
+
+	if (cust_id != 0) {
+		dev_err(wm8350->dev, "Unsupported CUST_ID\n");
+		ret = -ENODEV;
+		goto err;
+	}
+
+	switch (mask_rev) {
+	case 0:
+		switch (chip_rev) {
 		case 0x4:
-			dev_info(wm8350->dev, "Found Rev E device\n");
+			dev_info(wm8350->dev, "WM8350 Rev E\n");
 			break;
 		case 0x5:
-			dev_info(wm8350->dev, "Found Rev F device\n");
+			dev_info(wm8350->dev, "WM8350 Rev F\n");
 			break;
 		case 0x6:
-			dev_info(wm8350->dev, "Found Rev G device\n");
+			dev_info(wm8350->dev, "WM8350 Rev G\n");
 			wm8350->power.rev_g_coeff = 1;
 			break;
 		case 0x7:
-			dev_info(wm8350->dev, "Found Rev H device\n");
+			dev_info(wm8350->dev, "WM8350 Rev H\n");
 			wm8350->power.rev_g_coeff = 1;
 			break;
 		default:
 			/* For safety we refuse to run on unknown hardware */
-			dev_info(wm8350->dev, "Found unknown rev %x\n",
-				 (id2 & WM8350_CHIP_REV_MASK) >> 12);
+			dev_err(wm8350->dev, "Unknown WM8350 CHIP_REV\n");
 			ret = -ENODEV;
 			goto err;
 		}
-	} else {
-		dev_info(wm8350->dev, "Device with ID %x is not a WM8350\n",
-			 id1);
+		break;
+
+	default:
+		dev_err(wm8350->dev, "Unknown MASK_REV\n");
 		ret = -ENODEV;
 		goto err;
 	}
 
-	mode = id2 & WM8350_CONF_STS_MASK >> 10;
-	mask = id2 & WM8350_CUST_ID_MASK;
-	dev_info(wm8350->dev, "Config mode %d, ROM mask %d\n", mode, mask);
-
 	ret = wm8350_create_cache(wm8350, mode);
 	if (ret < 0) {
-		printk(KERN_ERR "wm8350: failed to create register cache\n");
+		dev_err(wm8350->dev, "Failed to create register cache\n");
 		return ret;
 	}
 
include/linux/mfd/wm8350/core.h +6 -0
index 8563408..0d37572 100644
@@ -29,6 +29,7 @@
  */
 #define WM8350_RESET_ID                         0x00
 #define WM8350_ID                               0x01
+#define WM8350_REVISION				0x02
 #define WM8350_SYSTEM_CONTROL_1                 0x03
 #define WM8350_SYSTEM_CONTROL_2                 0x04
 #define WM8350_SYSTEM_HIBERNATE                 0x05
@@ -80,6 +81,11 @@
 #define WM8350_CUST_ID_MASK                     0x00FF
 
 /*
+ * R2 (0x02) - Revision
+ */
+#define WM8350_MASK_REV_MASK			0x00FF
+
+/*
  * R3 (0x03) - System Control 1
  */
 #define WM8350_CHIP_ON                          0x8000
Signature · 1 line
1.5.6.5
#2 lore raw
In reply to Mark Brown

Hi Mark,

Quoted 16 lines · Mark Brown

Rather than check for chip revisions in the WM8350 drivers have the core code set flags for relevant differences.

---
 drivers/mfd/wm8350-core.c         |   14 ++++++--------
 drivers/power/wm8350_power.c      |    2 +-
 include/linux/mfd/wm8350/core.h   |    8 --------
 include/linux/mfd/wm8350/supply.h |    2 ++
 4 files changed, 9 insertions(+), 17 deletions(-)
drivers/mfd/wm8350-core.c +0 -0
index 3f2a68d..84fc90e 100644

drivers/mfd/wm8350-core.c int wm8350_device_init(struct wm8350 *wm8350, int irq, · line 1241

Quoted 5 lines
drivers/mfd/wm8350-core.c +1 -1
@@ -1238,21 +1238,19 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 
 	if (id1 == 0x6143) {
 		switch ((id2 & WM8350_CHIP_REV_MASK) >> 12) {
-		case WM8350_REV_E:
+		case 0x4:

Dont you prefer to use the WM8350_REV_* values in your code rather than some undocumented constants like that ?
I understand that reading the code below will make those constants obvious, but still...

Cheers,
Samuel.

Quoted 77 lines
drivers/mfd/wm8350-core.c +5 -7
 			dev_info(wm8350->dev, "Found Rev E device\n");
-			wm8350->rev = WM8350_REV_E;
 			break;
-		case WM8350_REV_F:
+		case 0x5:
 			dev_info(wm8350->dev, "Found Rev F device\n");
-			wm8350->rev = WM8350_REV_F;
 			break;
-		case WM8350_REV_G:
+		case 0x6:
 			dev_info(wm8350->dev, "Found Rev G device\n");
-			wm8350->rev = WM8350_REV_G;
+			wm8350->power.rev_g_coeff = 1;
 			break;
-		case WM8350_REV_H:
+		case 0x7:
 			dev_info(wm8350->dev, "Found Rev H device\n");
-			wm8350->rev = WM8350_REV_H;
+			wm8350->power.rev_g_coeff = 1;
 			break;
 		default:
 			/* For safety we refuse to run on unknown hardware */
drivers/power/wm8350_power.c +1 -1
index 9c0a847..74e7593 100644
@@ -44,7 +44,7 @@ static int wm8350_read_usb_uvolts(struct wm8350 *wm8350)
 
 static inline int wm8350_charge_time_min(struct wm8350 *wm8350, int min)
 {
-	if (wm8350->rev < WM8350_REV_G)
+	if (!wm8350->power.rev_g_coeff)
 		return (((min - 30) / 15) & 0xf) << 8;
 	else
 		return (((min - 30) / 30) & 0xf) << 8;
include/linux/mfd/wm8350/core.h +0 -8
index d2614df..8563408 100644
@@ -558,12 +558,6 @@
 #define WM8350_IRQ_WKUP_ONKEY			48
 #define WM8350_IRQ_WKUP_GP_WAKEUP		49
 
-/* wm8350 chip revisions */
-#define WM8350_REV_E				0x4
-#define WM8350_REV_F				0x5
-#define WM8350_REV_G				0x6
-#define WM8350_REV_H				0x7
-
 #define WM8350_NUM_IRQ				63
 
 struct wm8350_reg_access {
@@ -585,8 +579,6 @@ struct wm8350_irq {
 };
 
 struct wm8350 {
-	int rev;		/* chip revision */
-
 	struct device *dev;
 
 	/* device IO */
include/linux/mfd/wm8350/supply.h +2 -0
index 7972151..2b94793 100644
@@ -127,6 +127,8 @@ struct wm8350_power {
 	struct power_supply usb;
 	struct power_supply ac;
 	struct wm8350_charger_policy *policy;
+
+	int rev_g_coeff;
 };
 
 #endif
Signature · 1 line
1.5.6.5
Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/
author
#3 lore raw
Quoted 4 lines · Samuel Ortiz

Dont you prefer to use the WM8350_REV_* values in your code rather than some undocumented constants like that ?
I understand that reading the code below will make those constants obvious, but still...

I don't find them enormously helpful, TBH - the constant gets used in exactly one place and there's been a bit of skew between what some of the ID registers are called and thier actual meaning which doesn't help.

I'll repost with the #defines for the revisons added back, though.

#4 lore raw
Quoted 7 lines · Mark Brown
Quoted 4 lines · Samuel Ortiz

Dont you prefer to use the WM8350_REV_* values in your code rather than some undocumented constants like that ?
I understand that reading the code below will make those constants obvious, but still...

Quoted 5 lines

I don't find them enormously helpful, TBH - the constant gets used in exactly one place and there's been a bit of skew between what some of the ID registers are called and thier actual meaning which doesn't help.

I'll repost with the #defines for the revisons added back, though.

Thanks for the patches. Both of them are now sitting in my for-next branch.

Cheers,
Samuel.

Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/