| Message ID | 20170317095527.10487-10-hdegoede@redhat.com |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi, On Fri, Mar 17, 2017 at 10:55:21AM +0100, Hans de Goede wrote: > When combined with an external fuel-gauge, upower needs voltage_max_design > as it internally does all its calculations in Watts and converts the > charge_foo properties from A to Watts by using voltage_max_design. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Assuming, that my comment on patch 14 works POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN is required in the fuel-gauge driver instead. As far as I understand it the charger voltage was too high for your device anyways, so that you capped it at 4.3V. So I assume, that you can just provide it via device properties. -- Sebastian > drivers/power/supply/bq24190_charger.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c > index 9fe69a5..82cb33d 100644 > --- a/drivers/power/supply/bq24190_charger.c > +++ b/drivers/power/supply/bq24190_charger.c > @@ -1103,6 +1103,13 @@ static int bq24190_battery_get_property(struct power_supply *psy, > val->intval = POWER_SUPPLY_TECHNOLOGY_UNKNOWN; > ret = 0; > break; > + case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN: > + /* > + * Report charger configured voltage as max design voltage, > + * not entirely correct, but userspace needs something here. > + */ > + ret = bq24190_charger_get_voltage(bdi, val); > + break; > case POWER_SUPPLY_PROP_TEMP_ALERT_MAX: > ret = bq24190_battery_get_temp_alert_max(bdi, val); > break; > @@ -1169,6 +1176,7 @@ static enum power_supply_property bq24190_battery_properties[] = { > POWER_SUPPLY_PROP_HEALTH, > POWER_SUPPLY_PROP_ONLINE, > POWER_SUPPLY_PROP_TECHNOLOGY, > + POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, > POWER_SUPPLY_PROP_TEMP_ALERT_MAX, > POWER_SUPPLY_PROP_SCOPE, > /* Begin of extended battery properties */ > @@ -1186,7 +1194,7 @@ static const struct power_supply_desc bq24190_battery_desc = { > .name = "bq24190-battery", > .type = POWER_SUPPLY_TYPE_BATTERY, > .properties = bq24190_battery_properties, > - .num_properties = 6, > + .num_properties = 7, > .get_property = bq24190_battery_get_property, > .set_property = bq24190_battery_set_property, > .property_is_writeable = bq24190_battery_property_is_writeable, > -- > 2.9.3 >
diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c index 9fe69a5..82cb33d 100644 --- a/drivers/power/supply/bq24190_charger.c +++ b/drivers/power/supply/bq24190_charger.c @@ -1103,6 +1103,13 @@ static int bq24190_battery_get_property(struct power_supply *psy, val->intval = POWER_SUPPLY_TECHNOLOGY_UNKNOWN; ret = 0; break; + case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN: + /* + * Report charger configured voltage as max design voltage, + * not entirely correct, but userspace needs something here. + */ + ret = bq24190_charger_get_voltage(bdi, val); + break; case POWER_SUPPLY_PROP_TEMP_ALERT_MAX: ret = bq24190_battery_get_temp_alert_max(bdi, val); break; @@ -1169,6 +1176,7 @@ static enum power_supply_property bq24190_battery_properties[] = { POWER_SUPPLY_PROP_HEALTH, POWER_SUPPLY_PROP_ONLINE, POWER_SUPPLY_PROP_TECHNOLOGY, + POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN, POWER_SUPPLY_PROP_TEMP_ALERT_MAX, POWER_SUPPLY_PROP_SCOPE, /* Begin of extended battery properties */ @@ -1186,7 +1194,7 @@ static const struct power_supply_desc bq24190_battery_desc = { .name = "bq24190-battery", .type = POWER_SUPPLY_TYPE_BATTERY, .properties = bq24190_battery_properties, - .num_properties = 6, + .num_properties = 7, .get_property = bq24190_battery_get_property, .set_property = bq24190_battery_set_property, .property_is_writeable = bq24190_battery_property_is_writeable,
When combined with an external fuel-gauge, upower needs voltage_max_design as it internally does all its calculations in Watts and converts the charge_foo properties from A to Watts by using voltage_max_design. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/power/supply/bq24190_charger.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)