Skip to content

Commit ee6cd8f

Browse files
Dzmitry Sankouskisre
authored andcommitted
power: supply: max77976_charger: fix constant current reporting
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: 715ecbc ("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>
1 parent cc3e883 commit ee6cd8f

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/power/supply/max77976_charger.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,10 @@ static int max77976_get_property(struct power_supply *psy,
292292
case POWER_SUPPLY_PROP_ONLINE:
293293
err = max77976_get_online(chg, &val->intval);
294294
break;
295-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX:
295+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
296296
val->intval = MAX77976_CHG_CC_MAX;
297297
break;
298-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
298+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
299299
err = max77976_get_integer(chg, CHG_CC,
300300
MAX77976_CHG_CC_MIN,
301301
MAX77976_CHG_CC_MAX,
@@ -330,7 +330,7 @@ static int max77976_set_property(struct power_supply *psy,
330330
int err = 0;
331331

332332
switch (psp) {
333-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
333+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
334334
err = max77976_set_integer(chg, CHG_CC,
335335
MAX77976_CHG_CC_MIN,
336336
MAX77976_CHG_CC_MAX,
@@ -355,7 +355,7 @@ static int max77976_property_is_writeable(struct power_supply *psy,
355355
enum power_supply_property psp)
356356
{
357357
switch (psp) {
358-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
358+
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
359359
case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
360360
return true;
361361
default:
@@ -368,8 +368,8 @@ static enum power_supply_property max77976_psy_props[] = {
368368
POWER_SUPPLY_PROP_CHARGE_TYPE,
369369
POWER_SUPPLY_PROP_HEALTH,
370370
POWER_SUPPLY_PROP_ONLINE,
371-
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
372-
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
371+
POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
372+
POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
373373
POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
374374
POWER_SUPPLY_PROP_MODEL_NAME,
375375
POWER_SUPPLY_PROP_MANUFACTURER,

0 commit comments

Comments
 (0)