]> www.infradead.org Git - users/hch/misc.git/commitdiff
power: supply: max77976_charger: fix constant current reporting
authorDzmitry Sankouski <dsankouski@gmail.com>
Thu, 18 Sep 2025 17:06:45 +0000 (20:06 +0300)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Thu, 18 Sep 2025 21:26:27 +0000 (23:26 +0200)
CHARGE_CONTROL_LIMIT is a wrong property to report charge current limit,
because `CHARGE_*` attributes represents capacity, not current. The
correct attribute to report and set charge current limit is
CONSTANT_CHARGE_CURRENT.

Rename CHARGE_CONTROL_LIMIT to CONSTANT_CHARGE_CURRENT.

Cc: stable@vger.kernel.org
Fixes: 715ecbc10d6a ("power: supply: max77976: add Maxim MAX77976 charger driver")
Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/max77976_charger.c

index e6fe68cebc32b6fa39df71616ca293ce20098150..3d6ff400553305014f872ce1b15628af14553bf4 100644 (file)
@@ -292,10 +292,10 @@ static int max77976_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_ONLINE:
                err = max77976_get_online(chg, &val->intval);
                break;
-       case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX:
+       case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
                val->intval = MAX77976_CHG_CC_MAX;
                break;
-       case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
+       case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
                err = max77976_get_integer(chg, CHG_CC,
                                           MAX77976_CHG_CC_MIN,
                                           MAX77976_CHG_CC_MAX,
@@ -330,7 +330,7 @@ static int max77976_set_property(struct power_supply *psy,
        int err = 0;
 
        switch (psp) {
-       case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
+       case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
                err = max77976_set_integer(chg, CHG_CC,
                                           MAX77976_CHG_CC_MIN,
                                           MAX77976_CHG_CC_MAX,
@@ -355,7 +355,7 @@ static int max77976_property_is_writeable(struct power_supply *psy,
                                          enum power_supply_property psp)
 {
        switch (psp) {
-       case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
+       case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
        case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
                return true;
        default:
@@ -368,8 +368,8 @@ static enum power_supply_property max77976_psy_props[] = {
        POWER_SUPPLY_PROP_CHARGE_TYPE,
        POWER_SUPPLY_PROP_HEALTH,
        POWER_SUPPLY_PROP_ONLINE,
-       POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
-       POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
+       POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
+       POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
        POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
        POWER_SUPPLY_PROP_MODEL_NAME,
        POWER_SUPPLY_PROP_MANUFACTURER,