• Linus Torvalds's avatar
    Merge tag 'for-v3.18' of git://git.infradead.org/battery-2.6 · 50fa8617
    Linus Torvalds authored
    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
    50fa8617
Makefile 1007 Bytes