power: supply: bq25980: Move props from battery node
Currently POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT and
POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE are exposed on
the battery node and this is incorrect.
This patch exposes both of them on the charger node rather
than the battery node.
Fixes: 5069185fc1
("power: supply: bq25980: Add support for the BQ259xx family")
Signed-off-by: Ricardo Rivera-Matos <r-rivera-matos@ti.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Родитель
2509555070
Коммит
04722cec14
|
@ -606,33 +606,6 @@ static int bq25980_get_state(struct bq25980_device *bq,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int bq25980_set_battery_property(struct power_supply *psy,
|
||||
enum power_supply_property psp,
|
||||
const union power_supply_propval *val)
|
||||
{
|
||||
struct bq25980_device *bq = power_supply_get_drvdata(psy);
|
||||
int ret = 0;
|
||||
|
||||
switch (psp) {
|
||||
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
|
||||
ret = bq25980_set_const_charge_curr(bq, val->intval);
|
||||
if (ret)
|
||||
return ret;
|
||||
break;
|
||||
|
||||
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
|
||||
ret = bq25980_set_const_charge_volt(bq, val->intval);
|
||||
if (ret)
|
||||
return ret;
|
||||
break;
|
||||
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int bq25980_get_battery_property(struct power_supply *psy,
|
||||
enum power_supply_property psp,
|
||||
union power_supply_propval *val)
|
||||
|
@ -701,6 +674,18 @@ static int bq25980_set_charger_property(struct power_supply *psy,
|
|||
return ret;
|
||||
break;
|
||||
|
||||
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
|
||||
ret = bq25980_set_const_charge_curr(bq, val->intval);
|
||||
if (ret)
|
||||
return ret;
|
||||
break;
|
||||
|
||||
case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
|
||||
ret = bq25980_set_const_charge_volt(bq, val->intval);
|
||||
if (ret)
|
||||
return ret;
|
||||
break;
|
||||
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -922,7 +907,6 @@ static struct power_supply_desc bq25980_battery_desc = {
|
|||
.name = "bq25980-battery",
|
||||
.type = POWER_SUPPLY_TYPE_BATTERY,
|
||||
.get_property = bq25980_get_battery_property,
|
||||
.set_property = bq25980_set_battery_property,
|
||||
.properties = bq25980_battery_props,
|
||||
.num_properties = ARRAY_SIZE(bq25980_battery_props),
|
||||
.property_is_writeable = bq25980_property_is_writeable,
|
||||
|
|
Загрузка…
Ссылка в новой задаче