• Linus Torvalds's avatar
    Merge tag 'for-v3.19' of git://git.infradead.org/battery-2.6 · 7051d8e6
    Linus Torvalds authored
    Pull power supply updates from Sebastian Reichel::
     "Power supply and reset changes for the v3.19 series
    
       - update power/reset drivers to use kernel restart handler
       - add power off driver for i.mx6
       - add DT support for gpio-charger"
    
    * tag 'for-v3.19' of git://git.infradead.org/battery-2.6:
      power: reset: adjust priority of simple syscon reboot driver
      power: ds2782_battery: Simplify the PM hooks
      power/reset: brcmstb: Register with kernel restart handler
      power/reset: hisi: Register with kernel restart handler
      power/reset: keystone: Register with kernel restart handler
      power/reset: axxia: Register with kernel restart handler
      power/reset: xgene: Register with kernel restart handler
      power/reset: xgene: Use mdelay instead of jiffies based timeout
      power/reset: xgene: Use local variable dev instead of pdev->dev
      power/reset: xgene: Drop devm_kfree
      power/reset: xgene: Return -ENOMEM if out of memory
      power/reset: vexpress: Register with kernel restart handler
      power: reset: imx-snvs-poweroff: add power off driver for i.mx6
      power: gpio-charger: add device tree support
      dt-bindings: document gpio-charger bindings
    7051d8e6
keystone-reset.c 4.24 KB