Messages in this thread | | | Date | Thu, 2 May 2019 01:27:38 +0200 | From | Sebastian Reichel <> | Subject | Re: [PATCH v5 1/3] power_supply: Add Standard, Adaptive, and Custom charge types |
| |
Hi Nick,
Yes. I merged the three patches adding the generic power supply properties, thanks.
-- Sebastian
On Wed, May 01, 2019 at 10:34:38AM -0600, Nick Crews wrote: > Hi Sebastian, does this look like an acceptable way of splitting up the > content into multiple commits? > > Sorry to bug, and thanks, > Nick > > On Tue, Apr 23, 2019 at 7:55 AM Enric Balletbo i Serra < > enric.balletbo@collabora.com> wrote: > > > > > > > On 18/4/19 18:43, Nick Crews wrote: > > > Add "Standard", "Adaptive", and "Custom" modes to the charge_type > > > property, to expand the existing "Trickle" and "Fast" modes. > > > I am adding them in order to support a new Chrome OS device, > > > but these properties should be general enough that they can be > > > used on other devices. > > > > > > The meaning of "Standard" is obvious, but "Adaptive" and "Custom" are > > > more tricky: "Adaptive" means that the charge controller uses some > > > custom algorithm to change the charge type automatically, with no > > > configuration needed. "Custom" means that the charge controller uses the > > > POWER_SUPPLY_PROP_CHARGE_CONTROL_* properties as configuration for some > > > other algorithm. > > > > > > v5 changes: > > > - Split up adding the charge types and adding the > > > POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD and > > > POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD properties into > > > two different commits. > > > v4 changes: > > > - Add documentation for the new properties, and add documentation for > > > the the previously missing charge_control_limit and > > > charge_control_limit_max properties. > > > > > > Signed-off-by: Nick Crews <ncrews@chromium.org> > > > > Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> > > > > > --- > > > Documentation/ABI/testing/sysfs-class-power | 12 +++++++++--- > > > drivers/power/supply/power_supply_sysfs.c | 2 +- > > > include/linux/power_supply.h | 8 ++++++-- > > > 3 files changed, 16 insertions(+), 6 deletions(-) > > > > > > diff --git a/Documentation/ABI/testing/sysfs-class-power > > b/Documentation/ABI/testing/sysfs-class-power > > > index 5e23e22dce1b..544c4e0ef8b6 100644 > > > --- a/Documentation/ABI/testing/sysfs-class-power > > > +++ b/Documentation/ABI/testing/sysfs-class-power > > > @@ -119,10 +119,16 @@ Date: July 2009 > > > Contact: linux-pm@vger.kernel.org > > > Description: > > > Represents the type of charging currently being applied to > > the > > > - battery. > > > + battery. "Trickle", "Fast", and "Standard" all mean > > different > > > + charging speeds. "Adaptive" means that the charger uses > > some > > > + algorithm to adjust the charge rate dynamically, without > > > + any user configuration required. "Custom" means that the > > charger > > > + uses the charge_control_* properties as configuration for > > some > > > + different algorithm. > > > > > > - Access: Read > > > - Valid values: "Unknown", "N/A", "Trickle", "Fast" > > > + Access: Read, Write > > > + Valid values: "Unknown", "N/A", "Trickle", "Fast", > > "Standard", > > > + "Adaptive", "Custom" > > > > > > What: > > /sys/class/power_supply/<supply_name>/charge_term_current > > > Date: July 2014 > > > diff --git a/drivers/power/supply/power_supply_sysfs.c > > b/drivers/power/supply/power_supply_sysfs.c > > > index dce24f596160..64dff5cfecc3 100644 > > > --- a/drivers/power/supply/power_supply_sysfs.c > > > +++ b/drivers/power/supply/power_supply_sysfs.c > > > @@ -56,7 +56,7 @@ static const char * const power_supply_status_text[] = > > { > > > }; > > > > > > static const char * const power_supply_charge_type_text[] = { > > > - "Unknown", "N/A", "Trickle", "Fast" > > > + "Unknown", "N/A", "Trickle", "Fast", "Standard", "Adaptive", > > "Custom" > > > }; > > > > > > static const char * const power_supply_health_text[] = { > > > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h > > > index 2f9c201a54d1..e86e05d8134d 100644 > > > --- a/include/linux/power_supply.h > > > +++ b/include/linux/power_supply.h > > > @@ -40,11 +40,15 @@ enum { > > > POWER_SUPPLY_STATUS_FULL, > > > }; > > > > > > +/* What algorithm is the charger using? */ > > > enum { > > > POWER_SUPPLY_CHARGE_TYPE_UNKNOWN = 0, > > > POWER_SUPPLY_CHARGE_TYPE_NONE, > > > - POWER_SUPPLY_CHARGE_TYPE_TRICKLE, > > > - POWER_SUPPLY_CHARGE_TYPE_FAST, > > > + POWER_SUPPLY_CHARGE_TYPE_TRICKLE, /* slow speed */ > > > + POWER_SUPPLY_CHARGE_TYPE_FAST, /* fast speed */ > > > + POWER_SUPPLY_CHARGE_TYPE_STANDARD, /* normal speed */ > > > + POWER_SUPPLY_CHARGE_TYPE_ADAPTIVE, /* dynamically adjusted > > speed */ > > > + POWER_SUPPLY_CHARGE_TYPE_CUSTOM, /* use CHARGE_CONTROL_* > > props */ > > > }; > > > > > > enum { > > > > > [unhandled content-type:application/pgp-signature] | |