| Message ID | 20191126120940.sjiiqdngnbez2a7x@earth.universe (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [GIT,PULL] power-supply changes for 5.5 | expand |
The pull request you sent on Tue, 26 Nov 2019 13:09:40 +0100:
> ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/for-v5.5
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/00074a7007c24f947a9f9baf66bf5db2fe651ee9
Thank you!
Hi Linus, The pull-request contains immutable branches shared with IIO for the ab8500 changes and with ARM for the cpcap changes. I don't expect any issues, since all patches have been in linux-next for roughly 4 weeks. -- Sebastian The following changes since commit 54ecb8f7028c5eb3d740bb82b0f1d90f2df63c5c: Linux 5.4-rc1 (2019-09-30 10:35:40 -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-v5.5 for you to fetch changes up to 9480029fe5c24d482efad38dc631bd555fc7afe2: power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading (2019-10-27 22:33:44 +0100) ---------------------------------------------------------------- power supply and reset changes for the v5.5 series Drivers: * test_power: add support for current and charge_counter * cpcap-charger: improve charge calculation and limit default charge voltage * ab8500: convert to IIO * misc. small fixes all over drivers ---------------------------------------------------------------- Ben Dooks (Codethink) (1): power: reset: at91: fix __le32 cast in reset code Claudiu Beznea (1): power: reset: at91-poweroff: lookup for proper PMC DT node Gustavo A. R. Silva (1): power: supply: ab8500_charger: Fix inconsistent IS_ERR and PTR_ERR Icenowy Zheng (1): power: supply: axp20x_usb_power: enable USB BC detection on AXP813 Krzysztof Kozlowski (3): power: supply: ab8500: Cleanup probe in reverse order power: supply: ab8500_fg: Do not free non-requested IRQs in probe's error path power: supply: ab8500: Handle invalid IRQ from platform_get_irq_byname() Linus Walleij (7): power: supply: ab8500_btemp: Convert to IIO ADC power: supply: ab8500_charger: Convert to IIO ADC power: supply: ab8500_fg: Convert to IIO ADC hwmon: ab8500: Convert to IIO ADC mfd: ab8500: Augment DT bindings iio: adc: New driver for the AB8500 GPADC mfd: Switch the AB8500 GPADC to IIO Madhuparna Bhowmik (1): power: supply: abx500_chargalg: Fix code indentation Matti Vaittinen (1): power: supply: bd70528: Add MODULE_ALIAS to allow module auto loading Sebastian Reichel (2): Merge remote-tracking branch 'ib-ab8500-5.4-rc1' into for-next Merge tag 'psy-cpcap-charge-volt-limit-signed' into psy-next Tony Lindgren (10): power: supply: cpcap-charger: Limit voltage to 4.2V for battery power: supply: cpcap-battery: Check voltage before orderly_poweroff power: supply: cpcap-charger: Improve battery detection power: supply: cpcap-battery: Fix handling of lowered charger voltage power: supply: cpcap-charger: Allow changing constant charge voltage power: supply: cpcap-battery: Move coulomb counter units per lsb to ddata power: supply: cpcap-battery: Simplify coulomb counter calculation with div_s64 power: supply: cpcap-battery: Simplify short term power average calculation power: supply: cpcap-battery: Read and save integrator register CCI power: supply: cpcap-battery: Add basic coulomb counter calibrate support kbuild test robot (1): power: supply: cpcap-charger: cpcap_charger_voltage_to_regval() can be static lecopzer@gmail.com (2): test_power: Add CHARGE_COUNTER properties test_power: Add CURRENT properties Documentation/devicetree/bindings/mfd/ab8500.txt | 119 ++ .../bindings/power/supply/cpcap-charger.txt | 9 +- MAINTAINERS | 1 + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 6 +- drivers/hwmon/Kconfig | 3 +- drivers/hwmon/ab8500.c | 65 +- drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ab8500-gpadc.c | 1218 ++++++++++++++++++++ drivers/mfd/Kconfig | 7 - drivers/mfd/Makefile | 1 - drivers/mfd/ab8500-debugfs.c | 715 ------------ drivers/mfd/ab8500-gpadc.c | 1075 ----------------- drivers/power/reset/at91-reset.c | 6 +- drivers/power/reset/at91-sama5d2_shdwc.c | 8 +- drivers/power/supply/Kconfig | 2 +- drivers/power/supply/ab8500_btemp.c | 50 +- drivers/power/supply/ab8500_charger.c | 83 +- drivers/power/supply/ab8500_fg.c | 49 +- drivers/power/supply/abx500_chargalg.c | 8 +- drivers/power/supply/axp20x_usb_power.c | 8 + drivers/power/supply/bd70528-charger.c | 1 + drivers/power/supply/cpcap-battery.c | 271 ++++- drivers/power/supply/cpcap-charger.c | 222 +++- drivers/power/supply/test_power.c | 61 + include/linux/mfd/abx500/ab8500-gpadc.h | 75 -- 26 files changed, 2044 insertions(+), 2030 deletions(-) create mode 100644 drivers/iio/adc/ab8500-gpadc.c delete mode 100644 drivers/mfd/ab8500-gpadc.c delete mode 100644 include/linux/mfd/abx500/ab8500-gpadc.h