• Linus Torvalds's avatar
    Merge tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 8649efb2
    Linus Torvalds authored
    Pull power supply and reset updates from Sebastian Reichel:
     "Core:
       - Add over-current health state
       - Add standard, adaptive and custom charge types
       - Add new properties for start/end charge threshold
    
      New Drivers / Hardware:
       - UCS1002 Programmable USB Port Power Controller
       - Ingenic JZ47xx Battery Fuel Gauge
       - AXP20x USB Power: Add AXP813 support
       - AT91 poweroff: Add SAM9X60 support
       - OLPC battery: Add XO-1.5 and XO-1.75 support
    
      Misc Changes:
       - syscon-reboot: support mask property
       - AXP288 fuel gauge: Blacklist ACEPC T8/T11. Looks like some vendor
         thought it's a good idea to build a desktop system with a fuel
         gauge, that slowly "discharges"...
       - cpcap-battery: Fix calculation errors
       - misc fixes"
    
    * tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (54 commits)
      power: supply: olpc_battery: force the le/be casts
      power: supply: ucs1002: Fix build error without CONFIG_REGULATOR
      power: supply: ucs1002: Fix wrong return value checking
      power: supply: Add driver for Microchip UCS1002
      dt-bindings: power: supply: Add bindings for Microchip UCS1002
      power: supply: core: Add POWER_SUPPLY_HEALTH_OVERCURRENT constant
      power: supply: core: fix clang -Wunsequenced
      power: supply: core: Add missing documentation for CHARGE_CONTROL_* properties
      power: supply: core: Add CHARGE_CONTROL_{START_THRESHOLD,END_THRESHOLD} properties
      power: supply: core: Add Standard, Adaptive, and Custom charge types
      power: supply: axp288_fuel_gauge: Add ACEPC T8 and T11 mini PCs to the blacklist
      power: supply: bq27xxx_battery: Notify also about status changes
      power: supply: olpc_battery: Have the framework register sysfs files for us
      power: supply: olpc_battery: Add OLPC XO 1.75 support
      power: supply: olpc_battery: Avoid using platform_info
      power: supply: olpc_battery: Use devm_power_supply_register()
      power: supply: olpc_battery: Move priv data to a struct
      power: supply: olpc_battery: Use DT to get battery version
      x86/platform/olpc: Use a correct version when making up a battery node
      x86/platform/olpc: Trivial code move in DT fixup
      ...
    8649efb2
power_supply_sysfs.c 11.4 KB