diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-15 21:06:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-15 21:06:15 -0700 |
| commit | 5fe7b600a116187e10317d83fb56922c4ef6b76d (patch) | |
| tree | 8586fc00d7dd14aa0e8853f53c00426faa3606d1 /Documentation/power | |
| parent | fb4da215ed92f564f7ca090bb81a199b0d6cab8a (diff) | |
| parent | caa2b557841c8cedc1d4862cd31cf76ee940d105 (diff) | |
Merge tag 'for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
"Core:
- add HWMON compat layer
- new properties:
- input power limit
- input voltage limit
Drivers:
- qcom-pon: add gen2 support
- new driver for storing reboot move in NVMEM
- new driver for Wilco EC charger configuration
- simplify getting the adapter of a client"
* tag 'for-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: reset: nvmem-reboot-mode: add CONFIG_OF dependency
power_supply: wilco_ec: Add charging config driver
power: supply: cros: allow to set input voltage and current limit
power: supply: add input power and voltage limit properties
power: supply: fix semicolon.cocci warnings
power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface
dt-bindings: power: reset: add document for NVMEM based reboot-mode
reset: qcom-pon: Add support for gen2 pon
dt-bindings: power: reset: qcom: Add qcom,pm8998-pon compatibility line
power: supply: Add HWMON compatibility layer
power: supply: sbs-manager: simplify getting the adapter of a client
power: supply: rt9455_charger: simplify getting the adapter of a client
power: supply: rt5033_battery: simplify getting the adapter of a client
power: supply: max17042_battery: simplify getting the adapter of a client
power: supply: max17040_battery: simplify getting the adapter of a client
power: supply: max14656_charger_detector: simplify getting the adapter of a client
power: supply: bq25890_charger: simplify getting the adapter of a client
power: supply: bq24257_charger: simplify getting the adapter of a client
power: supply: bq24190_charger: simplify getting the adapter of a client
Diffstat (limited to 'Documentation/power')
| -rw-r--r-- | Documentation/power/power_supply_class.rst | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/power/power_supply_class.rst b/Documentation/power/power_supply_class.rst index 3f2c3fe38a61..7b8c42f8b1de 100644 --- a/Documentation/power/power_supply_class.rst +++ b/Documentation/power/power_supply_class.rst @@ -165,6 +165,12 @@ CONSTANT_CHARGE_VOLTAGE_MAX INPUT_CURRENT_LIMIT input current limit programmed by charger. Indicates the current drawn from a charging source. +INPUT_VOLTAGE_LIMIT + input voltage limit programmed by charger. Indicates + the voltage limit from a charging source. +INPUT_POWER_LIMIT + input power limit programmed by charger. Indicates + the power limit from a charging source. CHARGE_CONTROL_LIMIT current charge control limit setting |