Hi Linus,
Please pull the power-supply changes for the 5.9 development cycle.
Stephen mentioned one trivial merge conflict between the
power-supply tree and the set_fs tree and has the correct solution:
https://lore.kernel.org/linux-next/[email protected]/
The following changes since commit b3a9e3b9622ae10064826dccb4f7a52bd88c7407:
Linux 5.8-rc1 (2020-06-14 12:45:04 -0700)
are available in the Git repository at:
ssh://[email protected]/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v5.9
for you to fetch changes up to 46cbd0b05799e8234b719d18f3a4b27679c4c92e:
power: supply: wilco_ec: Add long life charging mode (2020-07-31 14:33:56 +0200)
----------------------------------------------------------------
power supply and reset changes for the v5.9 series
power-supply core:
* add COOL/WARM/HOT state from JEITA JISC8712:2015 specification
* convert simple-battery DT binding to YAML
* add long-life charging mode
battery/charger drivers:
* bq25150: new charger driver
* bq27xxx: add support for BQ27z561 and BQ28z610
* max17040: support CAPACITY_ALERT_MIN
* sbs-battery: add PEC support
* wilco-ec: support long-life charging mode
* bq25890: fix DT binding
* misc. fixes and cleanups
reset drivers:
* linkstation: new reset driver
----------------------------------------------------------------
Alexander A. Klimov (2):
power: reset: keystone-reset: Replace HTTP links with HTTPS ones
power: supply: bq2xxxx: Replace HTTP links with HTTPS ones
Chunyan Zhang (2):
math64: New DIV_S64_ROUND_CLOSEST helper
power: supply: sc27xx: prevent adc * 1000 from overflow
Crag Wang (1):
power: supply: wilco_ec: Add long life charging mode
Dan Murphy (6):
power_supply: Add additional health properties to the header
dt-bindings: power: Convert battery.txt to battery.yaml
dt-bindings: power: Add BQ27Z561 compatible
power: supply: bq27xxx_battery: Add the BQ27Z561 Battery monitor
dt-bindings: power: Add BQ28z610 compatible
power: supply: bq27xxx_battery: Add the BQ28z610 Battery monitor
Daniel Gonz?lez Cabanelas (1):
power: reset: add driver for LinkStation power off
Dinghao Liu (1):
power: supply: bq24190_charger: Fix runtime PM imbalance on error
Jonathan Bakker (1):
power: supply: max8998_charger: Correct ONLINE and add STATUS props
Keyur Patel (1):
power: supply: axp20x_usb_power: fix spelling mistake
Krzysztof Kozlowski (4):
dt-bindings: power: supply: bq25890: Indent example with tabs
dt-bindings: power: supply: bq25890: Document required interrupt
power: supply: cpcap-battery: Fix kerneldoc of cpcap_battery_read_accumulated()
power: supply: Fix kerneldoc of power_supply_temp2resist_simple()
LH Lin (1):
power: supply: test_power: Fix battery_current initial value
Matheus Castello (1):
power: supply: max17040: Add POWER_SUPPLY_PROP_CAPACITY_ALERT_MIN
Peng Fan (1):
power: supply: rt5033_battery: Fix error code in rt5033_battery_probe()
Randy Dunlap (1):
power: fix duplicated words in bq2415x_charger.h
Ricardo Rivera-Matos (2):
dt-bindings: power: Add the bindings for the bq2515x family of chargers.
power: supply: bq25150 introduce the bq25150
Sebastian Reichel (4):
dt-bindings: power: supply: gpio-charger: convert to yaml
power: supply: gpio-charger: Make gpios optional
power: supply: sbs-battery: use i2c_smbus_read_block_data()
power: supply: sbs-battery: add PEC support
Tom Rix (1):
power: supply: check if calc_soc succeeded in pm860x_init_battery
Wang Qing (1):
power: supply: use kobj_to_dev
Yongqiang Liu (1):
power: Convert to DEFINE_SHOW_ATTRIBUTE
Documentation/ABI/testing/sysfs-class-power | 3 +-
Documentation/ABI/testing/sysfs-class-power-wilco | 4 +
.../devicetree/bindings/power/supply/battery.txt | 86 +-
.../devicetree/bindings/power/supply/battery.yaml | 144 +++
.../devicetree/bindings/power/supply/bq2515x.yaml | 93 ++
.../devicetree/bindings/power/supply/bq25890.txt | 30 +-
.../devicetree/bindings/power/supply/bq27xxx.yaml | 2 +
.../bindings/power/supply/gpio-charger.txt | 31 -
.../bindings/power/supply/gpio-charger.yaml | 63 ++
drivers/power/reset/Kconfig | 11 +
drivers/power/reset/Makefile | 1 +
drivers/power/reset/keystone-reset.c | 2 +-
drivers/power/reset/linkstation-poweroff.c | 136 +++
drivers/power/supply/88pm860x_battery.c | 6 +-
drivers/power/supply/Kconfig | 13 +
drivers/power/supply/Makefile | 1 +
drivers/power/supply/axp20x_usb_power.c | 2 +-
drivers/power/supply/bq2415x_charger.c | 16 +-
drivers/power/supply/bq24190_charger.c | 4 +-
drivers/power/supply/bq24257_charger.c | 6 +-
drivers/power/supply/bq2515x_charger.c | 1169 ++++++++++++++++++++
drivers/power/supply/bq27xxx_battery.c | 160 ++-
drivers/power/supply/bq27xxx_battery_hdq.c | 2 +-
drivers/power/supply/bq27xxx_battery_i2c.c | 6 +-
drivers/power/supply/cpcap-battery.c | 2 +-
drivers/power/supply/da9030_battery.c | 12 +-
drivers/power/supply/gpio-charger.c | 38 +-
drivers/power/supply/max17040_battery.c | 51 +-
drivers/power/supply/max8998_charger.c | 25 +-
drivers/power/supply/power_supply_core.c | 2 +-
drivers/power/supply/power_supply_sysfs.c | 6 +-
drivers/power/supply/rt5033_battery.c | 2 +-
drivers/power/supply/sbs-battery.c | 89 +-
drivers/power/supply/sc27xx_fuel_gauge.c | 9 +-
drivers/power/supply/test_power.c | 2 +-
drivers/power/supply/wilco-charger.c | 5 +
include/linux/math64.h | 19 +
include/linux/power/bq2415x_charger.h | 4 +-
include/linux/power/bq27xxx_battery.h | 2 +
include/linux/power_supply.h | 4 +
40 files changed, 2044 insertions(+), 219 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power/supply/battery.yaml
create mode 100644 Documentation/devicetree/bindings/power/supply/bq2515x.yaml
delete mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.txt
create mode 100644 Documentation/devicetree/bindings/power/supply/gpio-charger.yaml
create mode 100644 drivers/power/reset/linkstation-poweroff.c
create mode 100644 drivers/power/supply/bq2515x_charger.c
The pull request you sent on Sat, 8 Aug 2020 00:59:43 +0200:
> ssh://[email protected]/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v5.9
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/449dc8c97089a6e09fb2dac4d92b1b7ac0eb7c1e
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html