power_supply: Add additional health properties to the header

Add HEALTH_WARM, HEALTH_COOL and HEALTH_HOT to the health enum.

HEALTH_WARM, HEALTH_COOL, and HEALTH_HOT properties are taken
from JEITA specification JISC8712:2015

Acked-by: Andrew F. Davis <afd@ti.com>
Tested-by: Guru Das Srinagesh <gurus@codeaurora.org>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/Documentation/ABI/testing/sysfs-class-power b/Documentation/ABI/testing/sysfs-class-power
index 216d61a22f1e72cadb1961fc3ad8a774fcb7395d..40213c73bc9c45388085367c062b933adbfce163 100644 (file)
--- a/Documentation/ABI/testing/sysfs-class-power
+++ b/Documentation/ABI/testing/sysfs-class-power
@@ -205,7 +205,8 @@ Description:
                Valid values: "Unknown", "Good", "Overheat", "Dead",
                              "Over voltage", "Unspecified failure", "Cold",
                              "Watchdog timer expire", "Safety timer expire",
-                             "Over current", "Calibration required"
+                             "Over current", "Calibration required", "Warm",
+                             "Cool", "Hot"
 
 What:          /sys/class/power_supply/<supply_name>/precharge_current
 Date:          June 2017

diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
index af0cad253f52145002d51410b081d5d419eb9d12..b903cb4dca2be293d4cacc77a2894a5bc29aec16 100644 (file)
--- a/drivers/power/supply/power_supply_sysfs.c
+++ b/drivers/power/supply/power_supply_sysfs.c
@@ -101,6 +101,9 @@ static const char * const POWER_SUPPLY_HEALTH_TEXT[] = {
        [POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE]   = "Safety timer expire",
        [POWER_SUPPLY_HEALTH_OVERCURRENT]           = "Over current",
        [POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED]  = "Calibration required",
+       [POWER_SUPPLY_HEALTH_WARM]                  = "Warm",
+       [POWER_SUPPLY_HEALTH_COOL]                  = "Cool",
+       [POWER_SUPPLY_HEALTH_HOT]                   = "Hot",
 };
 
 static const char * const POWER_SUPPLY_TECHNOLOGY_TEXT[] = {

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index ac1345a48ad051737ed2355f94e68fbaae9e2131..b5ee35d3c3046cf4c0309bd2ce268e88163c3b1e 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -62,6 +62,9 @@ enum {
        POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE,
        POWER_SUPPLY_HEALTH_OVERCURRENT,
        POWER_SUPPLY_HEALTH_CALIBRATION_REQUIRED,
+       POWER_SUPPLY_HEALTH_WARM,
+       POWER_SUPPLY_HEALTH_COOL,
+       POWER_SUPPLY_HEALTH_HOT,
 };
 
 enum {