| Message ID | 20230429165843.uobwenl6dy7x3vtr@mercury.elektranox.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [GIT,PULL] power-supply changes for 6.4 | expand |
The pull request you sent on Sat, 29 Apr 2023 18:58:43 +0200:
> ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v6.4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/17d4ded2fc9d4f0b7c3c74ed9f80420c59d36e0b
Thank you!
Hi Linus, Not much this time, since I was super busy in this cycle. The pull contains two merges. I had to merge in 6.3-rc3 for the ACPI axp288_charger fix and my 6.3 power-supply fixes branch for the rk817 fixes (as mentioned in the merge commit). I did not manage to generate a proper diff stat for that, so the below one contains the 6.3 fixes patches you already queued. Thanks, -- Sebastian The following changes since commit e8d018dd0257f744ca50a729e3d042cf2ec9da65: Linux 6.3-rc3 (2023-03-19 13:27:55 -0700) are available in the Git repository at: ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v6.4 for you to fetch changes up to baba1315a74d12772d4940a05d58dc03e6ec0635: power: supply: rk817: Fix low SOC bugs (2023-04-08 00:30:05 +0200) ---------------------------------------------------------------- power supply and reset changes for the v6.4 series - power-supply core support for automatic handling of constant battery data supplied by firmware - generic-adc-battery: major cleanup - axp288_charger: fix ACPI issues on x86 Android tablets - rk817: cleanup and fix handling for low state of charge ---------------------------------------------------------------- Chris Morgan (2): power: supply: rk817: Drop unneeded debugging code power: supply: rk817: Fix low SOC bugs Denis Arefev (1): power: supply: axp288_fuel_gauge: Added check for negative values Grant Grundler (1): power: supply: cros_usbpd: reclassify "default case!" as debug Hans de Goede (1): power: supply: axp288_charger: Use alt usb-id extcon on some x86 android tablets Hermes Zhang (1): power: supply: bq256xx: Support to disable charger Jiapeng Chong (1): power: supply: rk817: Fix unsigned comparison with less than zero Krzysztof Kozlowski (7): power: supply: rt9455_charger: mark OF related data as maybe unused power: supply: twl4030_charger: mark OF related data as maybe unused power: supply: lp8727_charger: mark OF related data as maybe unused power: supply: ltc4162-l-charger: mark OF related data as maybe unused power: supply: bq24257_charger: mark OF related data as maybe unused power: supply: bq25890_charger: mark OF related data as maybe unused power: reset: qcom-pon: drop of_match_ptr for ID table Rob Herring (1): power: supply: charger-manager: Use of_property_read_bool() for boolean properties Sebastian Reichel (16): dt-bindings: power: supply: adc-battery: add binding power: supply: core: auto-exposure of simple-battery data power: supply: generic-adc-battery: convert to managed resources power: supply: generic-adc-battery: fix unit scaling power: supply: generic-adc-battery: drop jitter delay support power: supply: generic-adc-battery: drop charge now support power: supply: generic-adc-battery: drop memory alloc error message power: supply: generic-adc-battery: use simple-battery API power: supply: generic-adc-battery: simplify read_channel logic power: supply: generic-adc-battery: add temperature support power: supply: generic-adc-battery: add DT support power: supply: generic-adc-battery: update copyright info power: supply: generic-adc-battery: improve error message power: supply: generic-adc-battery: style fixes Merge tag 'v6.3-rc3' Merge tag 'for-v6.3-rc' Zheng Wang (2): power: supply: bq24190: Fix use after free bug in bq24190_remove due to race condition power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition .../bindings/power/supply/adc-battery.yaml | 70 ++++++ drivers/power/reset/qcom-pon.c | 2 +- drivers/power/supply/axp288_charger.c | 15 +- drivers/power/supply/axp288_fuel_gauge.c | 2 + drivers/power/supply/bq24190_charger.c | 1 + drivers/power/supply/bq24257_charger.c | 2 +- drivers/power/supply/bq256xx_charger.c | 40 ++++ drivers/power/supply/bq25890_charger.c | 2 +- drivers/power/supply/charger-manager.c | 2 +- drivers/power/supply/cros_usbpd-charger.c | 2 +- drivers/power/supply/da9150-charger.c | 1 + drivers/power/supply/generic-adc-battery.c | 245 ++++++--------------- drivers/power/supply/lp8727_charger.c | 2 +- drivers/power/supply/ltc4162-l-charger.c | 2 +- drivers/power/supply/power_supply_core.c | 179 +++++++++++++-- drivers/power/supply/power_supply_sysfs.c | 23 +- drivers/power/supply/rk817_charger.c | 46 ++-- drivers/power/supply/rt9455_charger.c | 2 +- drivers/power/supply/twl4030_charger.c | 2 +- include/linux/power/generic-adc-battery.h | 23 -- include/linux/power_supply.h | 8 + 21 files changed, 415 insertions(+), 256 deletions(-) create mode 100644 Documentation/devicetree/bindings/power/supply/adc-battery.yaml delete mode 100644 include/linux/power/generic-adc-battery.h