From 6b25860800d594046156a36e0f4fad2d5f6f3af6 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Sat, 2 Apr 2022 02:50:14 +0200 Subject: [PATCH 226/389] power: supply: axp20x-battery: Support POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR Support force disabling the charger in a more standardized way. Signed-off-by: Ondrej Jirman --- drivers/power/supply/axp20x_battery.c | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/power/supply/axp20x_battery.c b/drivers/power/supply/axp20x_battery.c index e66a4e32ace8..e982f66f5f28 100644 --- a/drivers/power/supply/axp20x_battery.c +++ b/drivers/power/supply/axp20x_battery.c @@ -228,6 +228,19 @@ static int axp20x_battery_get_prop(struct power_supply *psy, val->intval = !!(reg & AXP20X_PWR_OP_BATT_PRESENT); break; + case POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR: + ret = regmap_read(axp20x_batt->regmap, AXP20X_CHRG_CTRL1, + ®); + if (ret) + return ret; + + if (reg & AXP20X_CHRG_CTRL1_ENABLE) + val->intval = POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO; + else + val->intval = POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE; + + return 0; + case POWER_SUPPLY_PROP_STATUS: ret = regmap_read(axp20x_batt->regmap, AXP20X_PWR_OP_MODE, ®); @@ -505,6 +518,21 @@ static int axp20x_battery_set_prop(struct power_supply *psy, case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX: return axp20x_set_max_constant_charge_current(axp20x_batt, val->intval); + case POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR: + switch (val->intval) { + case POWER_SUPPLY_CHARGE_BEHAVIOUR_AUTO: + return regmap_update_bits(axp20x_batt->regmap, + AXP20X_CHRG_CTRL1, + AXP20X_CHRG_CTRL1_ENABLE, + AXP20X_CHRG_CTRL1_ENABLE); + case POWER_SUPPLY_CHARGE_BEHAVIOUR_INHIBIT_CHARGE: + return regmap_update_bits(axp20x_batt->regmap, + AXP20X_CHRG_CTRL1, + AXP20X_CHRG_CTRL1_ENABLE, 0); + default: + return -EINVAL; + } + case POWER_SUPPLY_PROP_STATUS: switch (val->intval) { case POWER_SUPPLY_STATUS_CHARGING: @@ -526,6 +554,7 @@ static enum power_supply_property axp20x_battery_props[] = { POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_STATUS, + POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR, POWER_SUPPLY_PROP_VOLTAGE_NOW, POWER_SUPPLY_PROP_CURRENT_NOW, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT, @@ -541,6 +570,7 @@ static int axp20x_battery_prop_writeable(struct power_supply *psy, enum power_supply_property psp) { return psp == POWER_SUPPLY_PROP_STATUS || + psp == POWER_SUPPLY_PROP_CHARGE_BEHAVIOUR || psp == POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN || psp == POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN || psp == POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT || -- 2.35.3