• Linus Torvalds's avatar
    Merge tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6 · 7313264b
    Linus Torvalds authored
    Pull battery subsystem updates from Anton Vorontsov:
     "Highlights:
    
       - Two new drivers from Pali Rohár and N900 hackers: rx51_battery and
         bq2415x_charger.  The drivers are a part of a solution to replace
         the proprietary Nokia BME stack
    
       - Power supply core now registers devices with a thermal cooling
         subsystem, so we can now automatically throttle charging.  Thanks
         to Ramakrishna Pallala!
    
       - Device tree support for ab8500 and max8925_power drivers
    
       - Random fixups and enhancements for a bunch of drivers."
    
    * tag 'for-v3.8-merged' of git://git.infradead.org/battery-2.6: (22 commits)
      max8925_power: Add support for device-tree initialization
      ab8500: Add devicetree support for chargalg
      ab8500: Add devicetree support for charger
      ab8500: Add devicetree support for btemp
      ab8500: Add devicetree support for fuelgauge
      twl4030_charger: Change TWL4030_MODULE_* ids to TWL_MODULE_*
      jz4740-battery: Use devm_request_and_ioremap
      jz4740-battery: Use devm_kzalloc
      bq27x00_battery: Fixup nominal available capacity reporting
      bq2415x_charger: Fix style issues
      bq2415x_charger: Add Kconfig/Makefile entries
      power_supply: Add bq2415x charger driver
      power_supply: Add new Nokia RX-51 (N900) power supply battery driver
      max17042_battery: Fix missing verify_model_lock() return value check
      ds2782_battery: Fix signedness bug in ds278x_read_reg16()
      lp8788-charger: Fix ADC channel names
      lp8788-charger: Fix wrong ADC conversion
      lp8788-charger: Use consumer device name on setting IIO channels
      power_supply: Register power supply for thermal cooling device
      power_supply: Add support for CHARGE_CONTROL_* attributes
      ...
    7313264b
power_supply_core.c 9.32 KB