| From a06a0905dc9bfc9346e28593d24bb7bd70fafd10 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 10 Feb 2021 16:56:46 -0600 |
| Subject: power: supply: bq25980: Move props from battery node |
| |
| From: Ricardo Rivera-Matos <r-rivera-matos@ti.com> |
| |
| [ Upstream commit 04722cec1436c732d39153ce6ae2ebf71ac3ade7 ] |
| |
| 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: 5069185fc18e ("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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/power/supply/bq25980_charger.c | 40 ++++++++------------------ |
| 1 file changed, 12 insertions(+), 28 deletions(-) |
| |
| diff --git a/drivers/power/supply/bq25980_charger.c b/drivers/power/supply/bq25980_charger.c |
| index c936f311eb4f..b94ecf814e43 100644 |
| --- a/drivers/power/supply/bq25980_charger.c |
| +++ b/drivers/power/supply/bq25980_charger.c |
| @@ -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, |
| -- |
| 2.30.2 |
| |