power: supply: mm8013: fix "not charging" detection
authorThomas Weißschuh <linux@weissschuh.net>
Sun, 3 Mar 2024 15:31:13 +0000 (16:31 +0100)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Tue, 5 Mar 2024 23:34:29 +0000 (00:34 +0100)
The charge_behaviours property is meant as a control-knob that can be
changed by the user.

Page 23 of [0] which documents the flag CHG_INH as follows:

  CHG_INH : Charge Inhibit      When the current is more than or equal to charge
                                threshold current,
                                charge inhibit temperature (upper/lower limit) :1
                                charge permission temperature or the current is
                                less than charge threshold current :0

So this is pure read-only information which is better represented as
POWER_SUPPLY_STATUS_NOT_CHARGING.

[0] https://product.minebeamitsumi.com/en/product/category/ics/battery/fuel_gauge/parts/download/__icsFiles/afieldfile/2023/07/12/1_download_01_12.pdf

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20240303-power_supply-charge_behaviour_prop-v2-1-8ebb0a7c2409@weissschuh.net
Fixes: e39257cde7e8 ("power: supply: mm8013: Add more properties")
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/mm8013.c

index caa272b035649c4352f8e04d739a12dd0c5ca486..20c1651ca38e03a0d05c8110307766e2ba45fe49 100644 (file)
@@ -71,7 +71,6 @@ static int mm8013_checkdevice(struct mm8013_chip *chip)
 
 static enum power_supply_property mm8013_battery_props[] = {
        POWER_SUPPLY_PROP_CAPACITY,
-       POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR,
        POWER_SUPPLY_PROP_CHARGE_FULL,
        POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
        POWER_SUPPLY_PROP_CHARGE_NOW,
@@ -103,16 +102,6 @@ static int mm8013_get_property(struct power_supply *psy,
 
                val->intval = regval;
                break;
-       case POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR:
-               ret = regmap_read(chip->regmap, REG_FLAGS, &regval);
-               if (ret < 0)
-                       return ret;
-
-               if (regval & MM8013_FLAG_CHG_INH)
-                       val->intval = POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE;
-               else
-                       val->intval = POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO;
-               break;
        case POWER_SUPPLY_PROP_CHARGE_FULL:
                ret = regmap_read(chip->regmap, REG_FULL_CHARGE_CAPACITY, &regval);
                if (ret < 0)
@@ -187,6 +176,8 @@ static int mm8013_get_property(struct power_supply *psy,
 
                if (regval & MM8013_FLAG_DSG)
                        val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+               else if (regval & MM8013_FLAG_CHG_INH)
+                       val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                else if (regval & MM8013_FLAG_CHG)
                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
                else if (regval & MM8013_FLAG_FC)