Hi Linus,
Here is the power-supply pull request for v5.3. Stephen reported a
merge conflict with the PCI tree in linux-next, which contains a
patch updating the power related documentation files to ReST format.
The merge conflict solution from Stephen looks correct to me:
https://lkml.org/lkml/2019/6/27/1284
-- Sebastian
The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9:
Linux 5.2-rc1 (2019-05-19 15:47:09 -0700)
are available in the Git repository at:
ssh://[email protected]/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v5.3
for you to fetch changes up to caa2b557841c8cedc1d4862cd31cf76ee940d105:
power: reset: nvmem-reboot-mode: add CONFIG_OF dependency (2019-07-09 00:28:49 +0200)
----------------------------------------------------------------
power supply and reset changes for the v5.3 series
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
----------------------------------------------------------------
Andrey Smirnov (1):
power: supply: Add HWMON compatibility layer
Arnd Bergmann (1):
power: reset: nvmem-reboot-mode: add CONFIG_OF dependency
Enric Balletbo i Serra (2):
power: supply: add input power and voltage limit properties
power: supply: cros: allow to set input voltage and current limit
Han Nandor (2):
dt-bindings: power: reset: add document for NVMEM based reboot-mode
power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface
John Stultz (2):
dt-bindings: power: reset: qcom: Add qcom,pm8998-pon compatibility line
reset: qcom-pon: Add support for gen2 pon
Nick Crews (2):
platform/chrome: wilco_ec: Add property helper library
power_supply: wilco_ec: Add charging config driver
Sebastian Reichel (1):
Merge tag 'tags/ib-chrome-psy-5.3' into psy-next
Wolfram Sang (9):
power: supply: bq24190_charger: simplify getting the adapter of a client
power: supply: bq24257_charger: simplify getting the adapter of a client
power: supply: bq25890_charger: simplify getting the adapter of a client
power: supply: max14656_charger_detector: simplify getting the adapter of a client
power: supply: max17040_battery: simplify getting the adapter of a client
power: supply: max17042_battery: simplify getting the adapter of a client
power: supply: rt5033_battery: simplify getting the adapter of a client
power: supply: rt9455_charger: simplify getting the adapter of a client
power: supply: sbs-manager: simplify getting the adapter of a client
kbuild test robot (1):
power: supply: fix semicolon.cocci warnings
Documentation/ABI/testing/sysfs-class-power | 32 ++
Documentation/ABI/testing/sysfs-class-power-wilco | 30 ++
.../bindings/power/reset/nvmem-reboot-mode.txt | 26 ++
.../devicetree/bindings/power/reset/qcom,pon.txt | 1 +
Documentation/power/power_supply_class.txt | 4 +
drivers/platform/chrome/wilco_ec/Makefile | 2 +-
drivers/platform/chrome/wilco_ec/properties.c | 132 ++++++++
drivers/power/reset/Kconfig | 10 +
drivers/power/reset/Makefile | 1 +
drivers/power/reset/nvmem-reboot-mode.c | 76 +++++
drivers/power/reset/qcom-pon.c | 12 +-
drivers/power/supply/Kconfig | 23 ++
drivers/power/supply/Makefile | 2 +
drivers/power/supply/bq24190_charger.c | 2 +-
drivers/power/supply/bq24257_charger.c | 2 +-
drivers/power/supply/bq25890_charger.c | 2 +-
drivers/power/supply/cros_usbpd-charger.c | 116 +++++++
drivers/power/supply/max14656_charger_detector.c | 2 +-
drivers/power/supply/max17040_battery.c | 2 +-
drivers/power/supply/max17042_battery.c | 2 +-
drivers/power/supply/power_supply_core.c | 7 +
drivers/power/supply/power_supply_hwmon.c | 355 +++++++++++++++++++++
drivers/power/supply/power_supply_sysfs.c | 2 +
drivers/power/supply/rt5033_battery.c | 2 +-
drivers/power/supply/rt9455_charger.c | 2 +-
drivers/power/supply/sbs-manager.c | 2 +-
drivers/power/supply/ucs1002_power.c | 2 +-
drivers/power/supply/wilco-charger.c | 187 +++++++++++
include/linux/platform_data/wilco-ec.h | 71 +++++
include/linux/power_supply.h | 15 +
30 files changed, 1110 insertions(+), 14 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-power-wilco
create mode 100644 Documentation/devicetree/bindings/power/reset/nvmem-reboot-mode.txt
create mode 100644 drivers/platform/chrome/wilco_ec/properties.c
create mode 100644 drivers/power/reset/nvmem-reboot-mode.c
create mode 100644 drivers/power/supply/power_supply_hwmon.c
create mode 100644 drivers/power/supply/wilco-charger.c
The pull request you sent on Mon, 15 Jul 2019 21:49:33 +0200:
> ssh://[email protected]/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v5.3
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/5fe7b600a116187e10317d83fb56922c4ef6b76d
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker