mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
50fa86172b
- Initial support for the following chips * max77836 (charger) * max14577 (charger) * bq27742 (battery gauge) * ltc2952 (poweroff) * stih416 (restart) * syscon-reboot (restart) * gpio-restart (restart) - cleanup of power supply core - misc. fixes in power supply and reset drivers -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCgAGBQJUOWD7AAoJENju1/PIO/qaj5QP/AtbG96NRpX6Ou8W+qulhSbe npTKItRMERZhV+lJUAdmLxQq8Cy6I5Cobdj140oIM6HIKZ7Dh6jChxd2t+RCLsO0 Y16VMq45L9E/mQuVCLqSSNCPKrRjbF7hW+8gpym/Yc846o3Fv8nhTQzkWxCsVrDR rNerRnrUyvKpqRpCN88u4ZuOHjm/146nZtTsAzvL8nGnQBZFJHv4eu7D5nwSN0QS FrLiI/mE7h1KFcdK5LrZf51IfEP9w4RVV3vs1wEuP0iPS5dguv2dNzXXVZa5eD/2 AYSSouVKkgdwryLAvIIaDLD405UYl5Xgt5J6d+QKXxm2+eeZMEY36+PEK5WtRtBX CykzO2BgvxyOdz2HU9D8irR1Li71jVSWwQITMJ6bQsbKEQAhltmkmsTOxtqB+ekd 254rKcKWTqllmEhg1LR8PCidf8OZNEcKzXi4XmQdQIcKNF9tvdTXP5c0/FzuIAlQ tqWZW1kQK6/TTfx+XxeeszJWY5VknIaka2Bi83pOZYtu94CtUFBdEVkpaYmC433+ qLOto7VMy+AKYViTJJDDEnSEFiLNZz/zF+SUDf+YB1RelULSF3zC8CbDcZQa5fNm 4qTU1fl2gGrIZ1jDPPihm6xP8r9WkeuQWEytG2UJZoa+l4XmzfLHBUUDVo0zqTd3 txfmKca8Y3GhXGwINi1m =sj9S -----END PGP SIGNATURE----- Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6 Pull power supply and reset updates from Sebastian Reichel: - Initial support for the following chips * max77836 (charger) * max14577 (charger) * bq27742 (battery gauge) * ltc2952 (poweroff) * stih416 (restart) * syscon-reboot (restart) * gpio-restart (restart) - cleanup of power supply core - misc fixes in power supply and reset drivers * tag 'for-v3.18' of git://git.infradead.org/battery-2.6: (48 commits) power: ab8500_fg: Fix build warning Documentation: charger: max14577: Update the date of introducing ABI power: reset: corrections for simple syscon reboot driver Documentation: power: reset: Add documentation for generic SYSCON reboot driver power: reset: Add generic SYSCON register mapped reset bq27x00_battery: Fix flag reading for bq27742 power: reset: use restart_notifier mechanism for msm-poweroff power: Add simple gpio-restart driver power: reset: st: Provide DT bindings for ST's Power Reset driver power: reset: Add restart functionality for STiH41x platforms power: charger-manager: Fix NULL pointer exception with missing cm-fuel-gauge power: max14577: Fix circular config SYSFS dependency power: gpio-charger: do not use gpio value directly power: max8925: Use of_get_child_by_name power: max8925: Fix NULL ptr dereference on memory allocation failure bq27x00_battery: Add support to bq27742 Documentation: charger: max14577: Document exported sysfs entry devicetree: mfd: max14577: Add device tree bindings document power: max17040: Add ID for MAX77836 Fuel Gauge block charger: max14577: Configure battery-dependent settings from DTS and sysfs ... Conflicts: drivers/power/reset/Kconfig drivers/power/reset/Makefile
19 lines
1,007 B
Makefile
19 lines
1,007 B
Makefile
obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_AT91_POWEROFF) += at91-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_AT91_RESET) += at91-reset.o
|
|
obj-$(CONFIG_POWER_RESET_AXXIA) += axxia-reset.o
|
|
obj-$(CONFIG_POWER_RESET_BRCMSTB) += brcmstb-reboot.o
|
|
obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_GPIO_RESTART) += gpio-restart.o
|
|
obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
|
|
obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_LTC2952) += ltc2952-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o
|
|
obj-$(CONFIG_POWER_RESET_ST) += st-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_VERSATILE) += arm-versatile-reboot.o
|
|
obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o
|
|
obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o
|
|
obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o
|
|
obj-$(CONFIG_POWER_RESET_SYSCON) += syscon-reboot.o
|