mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 05:01:48 +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 |
||
|---|---|---|
| .. | ||
| avs | ||
| reset | ||
| 88pm860x_battery.c | ||
| 88pm860x_charger.c | ||
| ab8500_bmdata.c | ||
| ab8500_btemp.c | ||
| ab8500_charger.c | ||
| ab8500_fg.c | ||
| abx500_chargalg.c | ||
| apm_power.c | ||
| bq27x00_battery.c | ||
| bq2415x_charger.c | ||
| bq24190_charger.c | ||
| bq24735-charger.c | ||
| charger-manager.c | ||
| collie_battery.c | ||
| da9030_battery.c | ||
| da9052-battery.c | ||
| ds2760_battery.c | ||
| ds2780_battery.c | ||
| ds2781_battery.c | ||
| ds2782_battery.c | ||
| generic-adc-battery.c | ||
| goldfish_battery.c | ||
| gpio-charger.c | ||
| intel_mid_battery.c | ||
| ipaq_micro_battery.c | ||
| isp1704_charger.c | ||
| jz4740-battery.c | ||
| Kconfig | ||
| lp8727_charger.c | ||
| lp8788-charger.c | ||
| Makefile | ||
| max8903_charger.c | ||
| max8925_power.c | ||
| max8997_charger.c | ||
| max8998_charger.c | ||
| max14577_charger.c | ||
| max17040_battery.c | ||
| max17042_battery.c | ||
| olpc_battery.c | ||
| pcf50633-charger.c | ||
| pda_power.c | ||
| pm2301_charger.c | ||
| pm2301_charger.h | ||
| pmu_battery.c | ||
| power_supply_core.c | ||
| power_supply_leds.c | ||
| power_supply_sysfs.c | ||
| power_supply.h | ||
| rx51_battery.c | ||
| s3c_adc_battery.c | ||
| sbs-battery.c | ||
| smb347-charger.c | ||
| test_power.c | ||
| tosa_battery.c | ||
| tps65090-charger.c | ||
| twl4030_charger.c | ||
| twl4030_madc_battery.c | ||
| wm97xx_battery.c | ||
| wm831x_backup.c | ||
| wm831x_power.c | ||
| wm8350_power.c | ||
| z2_battery.c | ||