]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
power: supply: bq24190_charger: Add input_current_limit property
authorHans de Goede <hdegoede@redhat.com>
Tue, 15 Aug 2017 20:04:58 +0000 (22:04 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.co.uk>
Tue, 29 Aug 2017 10:26:59 +0000 (12:26 +0200)
Export the input current limit of the charger as a
POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT property on the charger
power_supply class device.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
drivers/power/supply/bq24190_charger.c

index d5a707e14526ac9b47716b5452cccc8b233ef68b..7360f4259e63b1f08e11bb439cad219afc71b56b 100644 (file)
@@ -865,6 +865,33 @@ static int bq24190_charger_set_voltage(struct bq24190_dev_info *bdi,
                        ARRAY_SIZE(bq24190_cvc_vreg_values), val->intval);
 }
 
+static int bq24190_charger_get_iinlimit(struct bq24190_dev_info *bdi,
+               union power_supply_propval *val)
+{
+       int iinlimit, ret;
+
+       ret = bq24190_get_field_val(bdi, BQ24190_REG_ISC,
+                       BQ24190_REG_ISC_IINLIM_MASK,
+                       BQ24190_REG_ISC_IINLIM_SHIFT,
+                       bq24190_isc_iinlim_values,
+                       ARRAY_SIZE(bq24190_isc_iinlim_values), &iinlimit);
+       if (ret < 0)
+               return ret;
+
+       val->intval = iinlimit;
+       return 0;
+}
+
+static int bq24190_charger_set_iinlimit(struct bq24190_dev_info *bdi,
+               const union power_supply_propval *val)
+{
+       return bq24190_set_field_val(bdi, BQ24190_REG_ISC,
+                       BQ24190_REG_ISC_IINLIM_MASK,
+                       BQ24190_REG_ISC_IINLIM_SHIFT,
+                       bq24190_isc_iinlim_values,
+                       ARRAY_SIZE(bq24190_isc_iinlim_values), val->intval);
+}
+
 static int bq24190_charger_get_property(struct power_supply *psy,
                enum power_supply_property psp, union power_supply_propval *val)
 {
@@ -905,6 +932,9 @@ static int bq24190_charger_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
                ret = bq24190_charger_get_voltage_max(bdi, val);
                break;
+       case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
+               ret = bq24190_charger_get_iinlimit(bdi, val);
+               break;
        case POWER_SUPPLY_PROP_SCOPE:
                val->intval = POWER_SUPPLY_SCOPE_SYSTEM;
                ret = 0;
@@ -956,6 +986,9 @@ static int bq24190_charger_set_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
                ret = bq24190_charger_set_voltage(bdi, val);
                break;
+       case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
+               ret = bq24190_charger_set_iinlimit(bdi, val);
+               break;
        default:
                ret = -EINVAL;
        }
@@ -977,6 +1010,7 @@ static int bq24190_charger_property_is_writeable(struct power_supply *psy,
        case POWER_SUPPLY_PROP_CHARGE_TYPE:
        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
+       case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
                ret = 1;
                break;
        default:
@@ -996,6 +1030,7 @@ static enum power_supply_property bq24190_charger_properties[] = {
        POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
        POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
        POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
+       POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
        POWER_SUPPLY_PROP_SCOPE,
        POWER_SUPPLY_PROP_MODEL_NAME,
        POWER_SUPPLY_PROP_MANUFACTURER,