From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Dec 2025 00:12:03 +0000 (-0800)
Subject: Merge tag 'for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0206c4eb6375155b9d50cad1500d2bca5cc8b3f;p=thirdparty%2Flinux.git

Merge tag 'for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply and reset updates from Sebastian Reichel:
  "Power-supply core:
   - documentation fixes

  power-supply drivers:
   - add BD71828 charger driver
   - add Richtek RT9756 driver
   - max77705: add adaptive input current support
   - max77705: add support for multiple devices
   - misc small fixes

  reset drivers:
   - add spacemit-p1 poweroff/reboot driver"

* tag 'for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  Revert "power: supply: qcom_battmgr: support disabling charge control"
  Documentation: power: rt9756: Document exported sysfs entries
  power: supply: rt9756: Add Richtek RT9756 smart cap divider charger
  dt-bindings: power: supply: Add Richtek RT9756 smart cap divider charger
  driver: reset: spacemit-p1: add driver for poweroff/reboot
  power: supply: apm_power: only unset own apm_get_power_status
  power: supply: use ktime_divns() to avoid 64-bit division
  docs: power: clean up power_supply_class.rst
  power: supply: qcom_battmgr: support disabling charge control
  power: supply: qcom_battmgr: clamp charge control thresholds
  power: supply: wm831x: Check wm831x_set_bits() return value
  power: supply: rt9467: Prevent using uninitialized local variable in rt9467_set_value_from_ranges()
  power: supply: rt9467: Return error on failure in rt9467_set_value_from_ranges()
  power: supply: max17040: Check iio_read_channel_processed() return code
  power: supply: cw2015: Check devm_delayed_work_autocancel() return code
  power: supply: rt5033_charger: Fix device node reference leaks
  power: supply: max77705: Fix potential IRQ chip conflict when probing two devices
  power: supply: max77705_charger: implement aicl feature
  MAINTAINERS: Add entry for BD71828 charger
  power: supply: Add bd718(15/28/78) charger driver
---

b0206c4eb6375155b9d50cad1500d2bca5cc8b3f
diff --cc drivers/power/supply/Makefile
index 6e37a3edf7e3a,cac57ab563d21..4b79d5abc49a7
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@@ -64,9 -64,9 +64,10 @@@ obj-$(CONFIG_CHARGER_RT5033)	+= rt5033_
  obj-$(CONFIG_CHARGER_RT9455)	+= rt9455_charger.o
  obj-$(CONFIG_CHARGER_RT9467)	+= rt9467-charger.o
  obj-$(CONFIG_CHARGER_RT9471)	+= rt9471.o
+ obj-$(CONFIG_CHARGER_RT9756)	+= rt9756.o
  obj-$(CONFIG_BATTERY_TWL4030_MADC)	+= twl4030_madc_battery.o
  obj-$(CONFIG_CHARGER_88PM860X)	+= 88pm860x_charger.o
 +obj-$(CONFIG_CHARGER_PF1550)	+= pf1550-charger.o
  obj-$(CONFIG_BATTERY_RX51)	+= rx51_battery.o
  obj-$(CONFIG_AB8500_BM)		+= ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o ab8500_chargalg.o
  obj-$(CONFIG_CHARGER_CPCAP)	+= cpcap-charger.o