Add battery health reporting for WM8350

PATCH In review Mark Brown 3 participants 7 messages Nov 20, 2008 – Dec 1, 2008

Subsystems (3)

Multifunction devices (MFD) Wolfson microelectronics drivers Power supply

lore

Share & tools

lore

Mark Brown

author

2008-11-20 15:20 UTC #0 lore raw

cover Add battery health reporting for WM8350

This (brief) series adds a new power supply health state for reporting excessively cold batteries then uses it when implementing battery health reporting for the WM8350. I'm not 100% happy with the name for the new state but I couldn't think of something consistent with the existing OVERHEAT.

Since the WM8350 PMU driver is queued in the mfd tree it probably makes sense to merge this via the same path?

Mark Brown

author

2008-11-20 15:24 UTC #1 lore raw

PATCH 1/2 power_supply: Add cold to the POWER_SUPPLY_HEALTH report values

Some systems are able to report problems with batteries being under temperature.

Signed-off-by Mark Brown <[email protected]>

---
 drivers/power/power_supply_sysfs.c |    2 +-
 include/linux/power_supply.h       |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

drivers/power/power_supply_sysfs.c +1 -1

index 23ae846..ac01e06 100644
@@ -45,7 +45,7 @@ static ssize_t power_supply_show_property(struct device *dev,
 	};
 	static char *health_text[] = {
 		"Unknown", "Good", "Overheat", "Dead", "Over voltage",
-		"Unspecified failure"
+		"Unspecified failure", "Cold",
 	};
 	static char *technology_text[] = {
 		"Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd",

include/linux/power_supply.h +1 -0

index f9348cb..8ff25e0 100644
@@ -45,6 +45,7 @@ enum {
 	POWER_SUPPLY_HEALTH_DEAD,
 	POWER_SUPPLY_HEALTH_OVERVOLTAGE,
 	POWER_SUPPLY_HEALTH_UNSPEC_FAILURE,
+	POWER_SUPPLY_HEALTH_COLD,
 };
 
 enum {

Signature · 1 line

1.5.6.5

Mark Brown

author

2008-11-20 15:23 UTC #2 lore raw

PATCH 2/2 power_supply: Add battery health reporting for WM8350

Implement support for reporting battery health in the WM8350 battery interface. Since we are now able to report this via the classs remove the diagnostics from the interrupt handler.

Signed-off-by Mark Brown <[email protected]>

---
 drivers/mfd/wm8350-regmap.c     |    2 +-
 drivers/power/wm8350_power.c    |   33 +++++++++++++++++++++++++--------
 include/linux/mfd/wm8350/core.h |    7 +++++++
 3 files changed, 33 insertions(+), 9 deletions(-)

drivers/mfd/wm8350-regmap.c +1 -1

index aaf394a..b43d64c 100644
@@ -1314,7 +1314,7 @@ const struct wm8350_reg_access wm8350_reg_io_map[] = {
 	{ 0xFFFF, 0xFFFF, 0xFFFF }, /* R223 */
 	{ 0x0000, 0x0000, 0x0000 }, /* R224 */
 	{ 0x8F3F, 0x0000, 0xFFFF }, /* R225 - DCDC/LDO status */
-	{ 0x0000, 0x0000, 0x0000 }, /* R226 */
+	{ 0x0000, 0x0000, 0xFFFF }, /* R226 - Charger status */
 	{ 0x0000, 0x0000, 0xFFFF }, /* R227 */
 	{ 0x0000, 0x0000, 0x0000 }, /* R228 */
 	{ 0x0000, 0x0000, 0x0000 }, /* R229 */

drivers/power/wm8350_power.c +25 -8

index 74e7593..1b16bf3 100644
@@ -190,22 +190,18 @@ static void wm8350_charger_handler(struct wm8350 *wm8350, int irq, void *data)
 	struct wm8350_charger_policy *policy = power->policy;
 
 	switch (irq) {
-	case WM8350_IRQ_CHG_BAT_HOT:
-		dev_err(wm8350->dev, "battery too hot\n");
-		break;
-	case WM8350_IRQ_CHG_BAT_COLD:
-		dev_err(wm8350->dev, "battery too cold\n");
-		break;
 	case WM8350_IRQ_CHG_BAT_FAIL:
 		dev_err(wm8350->dev, "battery failed\n");
 		break;
 	case WM8350_IRQ_CHG_TO:
 		dev_err(wm8350->dev, "charger timeout\n");
-		break;
-	case WM8350_IRQ_CHG_END:
 		power_supply_changed(&power->battery);
 		break;
+
+	case WM8350_IRQ_CHG_BAT_HOT:
+	case WM8350_IRQ_CHG_BAT_COLD:
 	case WM8350_IRQ_CHG_START:
+	case WM8350_IRQ_CHG_END:
 		power_supply_changed(&power->battery);
 		break;

@@ -308,6 +304,23 @@ static enum power_supply_property wm8350_usb_props[] = {
  *		Battery properties
  *********************************************************************/
 
+static int wm8350_bat_check_health(struct wm8350 *wm8350)
+{
+	u16 reg;
+
+	if (wm8350_read_battery_uvolts(wm8350) < 2850000)
+		return POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
+
+	reg = wm8350_reg_read(wm8350, WM8350_CHARGER_OVERRIDES);
+	if (reg & WM8350_CHG_BATT_HOT_OVRDE)
+		return POWER_SUPPLY_HEALTH_OVERHEAT;
+
+	if (reg & WM8350_CHG_BATT_COLD_OVRDE)
+		return POWER_SUPPLY_HEALTH_COLD;
+
+	return POWER_SUPPLY_HEALTH_GOOD;
+}
+
 static int wm8350_bat_get_property(struct power_supply *psy,
 				   enum power_supply_property psp,
 				   union power_supply_propval *val)

@@ -326,6 +339,9 @@ static int wm8350_bat_get_property(struct power_supply *psy,
 	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
 		val->intval = wm8350_read_battery_uvolts(wm8350);
 		break;
+	case POWER_SUPPLY_PROP_HEALTH:
+		val->intval = wm8350_bat_check_health(wm8350);
+		break;
 	default:
 		ret = -EINVAL;
 		break;

@@ -338,6 +354,7 @@ static enum power_supply_property wm8350_bat_props[] = {
 	POWER_SUPPLY_PROP_STATUS,
 	POWER_SUPPLY_PROP_ONLINE,
 	POWER_SUPPLY_PROP_VOLTAGE_NOW,
+	POWER_SUPPLY_PROP_HEALTH,
 };
 
 /*********************************************************************

include/linux/mfd/wm8350/core.h +7 -0

index 0d37572..baf5530 100644
@@ -58,6 +58,7 @@
 #define WM8350_OVER_CURRENT_INT_STATUS_MASK     0x25
 #define WM8350_GPIO_INT_STATUS_MASK             0x26
 #define WM8350_COMPARATOR_INT_STATUS_MASK       0x27
+#define WM8350_CHARGER_OVERRIDES		0xE2
 #define WM8350_MISC_OVERRIDES			0xE3
 #define WM8350_COMPARATOR_OVERRIDES		0xE7
 #define WM8350_STATE_MACHINE_STATUS		0xE9

@@ -533,6 +534,12 @@
 #define WM8350_DC1_STS                          0x0001
 
 /*
+ * R226 (0xE2) - Charger status
+ */
+#define WM8350_CHG_BATT_HOT_OVRDE		0x8000
+#define WM8350_CHG_BATT_COLD_OVRDE		0x4000
+
+/*
  * R227 (0xE3) - Misc Overrides
  */
 #define WM8350_USB_LIMIT_OVRDE			0x0400

Signature · 1 line

1.5.6.5

Anton Vorontsov

Acked-by on v1 2/2

2008-11-25 11:26 UTC #3 lore raw

Re: [PATCH 2/2] power_supply: Add battery health reporting for WM8350

Quoted 5 lines · Mark Brown

Implement support for reporting battery health in the WM8350 battery interface. Since we are now able to report this via the classs remove the diagnostics from the interrupt handler.
Signed-off-by Mark Brown <[email protected]>

Acked-by Anton Vorontsov <[email protected]>

Quoted 5 lines

---
 drivers/mfd/wm8350-regmap.c     |    2 +-
 drivers/power/wm8350_power.c    |   33 +++++++++++++++++++++++++--------
 include/linux/mfd/wm8350/core.h |    7 +++++++
 3 files changed, 33 insertions(+), 9 deletions(-)

Signature · 3 lines

Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2

Anton Vorontsov

Acked-by on v1 1/2

2008-11-25 11:25 UTC #4 lore raw

Re: [PATCH 1/2] power_supply: Add cold to the POWER_SUPPLY_HEALTH report values

In reply to Mark Brown

Quoted 4 lines · Mark Brown

Some systems are able to report problems with batteries being under temperature.
Signed-off-by Mark Brown <[email protected]>

Looks good to me.

Acked-by Anton Vorontsov <[email protected]>

Quoted 33 lines

---
 drivers/power/power_supply_sysfs.c |    2 +-
 include/linux/power_supply.h       |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

drivers/power/power_supply_sysfs.c +1 -1

index 23ae846..ac01e06 100644
@@ -45,7 +45,7 @@ static ssize_t power_supply_show_property(struct device *dev,
 	};
 	static char *health_text[] = {
 		"Unknown", "Good", "Overheat", "Dead", "Over voltage",
-		"Unspecified failure"
+		"Unspecified failure", "Cold",
 	};
 	static char *technology_text[] = {
 		"Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd",

include/linux/power_supply.h +1 -0

index f9348cb..8ff25e0 100644
@@ -45,6 +45,7 @@ enum {
 	POWER_SUPPLY_HEALTH_DEAD,
 	POWER_SUPPLY_HEALTH_OVERVOLTAGE,
 	POWER_SUPPLY_HEALTH_UNSPEC_FAILURE,
+	POWER_SUPPLY_HEALTH_COLD,
 };
 
 enum {

Signature · 1 line

1.5.6.5

Signature · 3 lines

Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2

Samuel Ortiz

2008-12-01 00:05 UTC #5 lore raw

Re: [PATCH 1/2] power_supply: Add cold to the POWER_SUPPLY_HEALTH report values

Quoted 9 lines · Anton Vorontsov

Quoted 4 lines · Mark Brown
Some systems are able to report problems with batteries being under temperature.
Signed-off-by Mark Brown <[email protected]>
Looks good to me.
Acked-by Anton Vorontsov <[email protected]>

Thanks guys, both patches applied.

Cheers,
Samuel.

Quoted 38 lines

Quoted 33 lines

---
 drivers/power/power_supply_sysfs.c |    2 +-
 include/linux/power_supply.h       |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

drivers/power/power_supply_sysfs.c +1 -1

index 23ae846..ac01e06 100644
@@ -45,7 +45,7 @@ static ssize_t power_supply_show_property(struct device *dev,
 	};
 	static char *health_text[] = {
 		"Unknown", "Good", "Overheat", "Dead", "Over voltage",
-		"Unspecified failure"
+		"Unspecified failure", "Cold",
 	};
 	static char *technology_text[] = {
 		"Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd",

include/linux/power_supply.h +1 -0

index f9348cb..8ff25e0 100644
@@ -45,6 +45,7 @@ enum {
 	POWER_SUPPLY_HEALTH_DEAD,
 	POWER_SUPPLY_HEALTH_OVERVOLTAGE,
 	POWER_SUPPLY_HEALTH_UNSPEC_FAILURE,
+	POWER_SUPPLY_HEALTH_COLD,
 };
 
 enum {

Signature · 1 line

1.5.6.5

Signature · 3 lines

Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2

Signature · 2 lines

Intel Open Source Technology Centre
http://oss.intel.com/

Samuel Ortiz

2008-11-24 19:24 UTC #6 lore raw

In reply to Mark Brown

Hi Mark,

Quoted 8 lines · Mark Brown

This (brief) series adds a new power supply health state for reporting excessively cold batteries then uses it when implementing battery health reporting for the WM8350. I'm not 100% happy with the name for the new state but I couldn't think of something consistent with the existing OVERHEAT.
Since the WM8350 PMU driver is queued in the mfd tree it probably makes sense to merge this via the same path?

Fine with me. I'll wait for Anton's feedback on those patches.

Cheers,
Samuel.

Signature · 2 lines

Intel Open Source Technology Centre
http://oss.intel.com/