Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-v3.10' of git://git.infradead.org/battery-2.6 · 151173e8
    Linus Torvalds authored
    Pull battery updates from Anton Vorontsov:
     "Highlights:
    
       - OpenFirmware/DeviceTree support for the Power Supply core: the core
         now automatically populates supplied_from hierarchy from the device
         tree.  With these patches chargers and batteries can now lookup
         each other without the board files support shim.  Rhyland Klein at
         NVIDIA did the work
    
       - New ST-Ericsson ABX500 hwmon driver.  The driver is heavily using
         the AB85xx core and depends on some recent changes to it, so that
         is why the driver comes through the battery tree.  It has an
         appropriate ack from the hwmon maintainer (i.e.  Guenter Roeck).
         Martin Persson at ST-Ericsson and Hongbo Zhang at Linaro authored
         the driver
    
       - Final bits to sync AB85xx ST-Ericsson changes into mainline.  The
         changes touch mfd parts, but these were acked by the appropriate
         MFD maintainer (ie Samuel Ortiz).  Lee Jones at Linaro did most of
         the work and lead the submission process.
    
      Minor changes, but still worth mentioning:
    
       - Battery temperature reporting fix for Nokia N900 phones
       - Versatile Express poweroff driver moved into drivers/power/reset/
       - Tree-wide: use devm_kzalloc() where appropriate
       - Tree-wide: dev_pm_ops cleanups/fixes"
    
    * tag 'for-v3.10' of git://git.infradead.org/battery-2.6: (112 commits)
      pm2301-charger: Fix suspend/resume
      charger-manager: Use kmemdup instead of kzalloc + memcpy
      power_supply: Populate supplied_from hierarchy from the device tree
      power_supply: Add core support for supplied_from
      power_supply: Define Binding for power-supplies
      rx51_battery: Fix reporting temperature
      hwmon: Add ST-Ericsson ABX500 hwmon driver
      ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
      ab8500_{bmdata,fg}: Add const attributes to some data arrays
      ab8500_bmdata: Eliminate CamelCase warning of some variables
      ab8500_btemp: Make ab8500_btemp_get* interfaces public
      goldfish_battery: Use resource_size()
      lp8788-charger: Use PAGE_SIZE for the sysfs read operation
      max8925_power: Use devm_kzalloc()
      da9030_battery: Use devm_kzalloc()
      da9052-battery: Use devm_kzalloc()
      ds2760_battery: Use devm_kzalloc()
      ds2780_battery: Use devm_kzalloc()
      gpio-charger: Use devm_kzalloc()
      isp1704_charger: Use devm_kzalloc()
      ...
    151173e8