Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 6b402bdf
    Linus Torvalds authored
    Pull more power-supply updates from Sebastian Reichel:
     "The power-supply subsystem has a few more changes for the v4.12 merge
      window:
    
       - New battery driver for AXP20X and AXP22X PMICs
    
       - Improve max17042_battery for usage on x86
    
       - Misc small cleanups & fixes"
    
    * tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (34 commits)
      power: supply: cpcap-charger: Keep trickle charger bits disabled
      power: supply: cpcap-charger: Fix enable for 3.8V charge setting
      power: supply: cpcap-charger: Fix charge voltage configuration
      power: supply: cpcap-charger: Fix charger name
      power: supply: twl4030-charger: make twl4030_bci_property_is_writeable static
      power: supply: sbs-battery: Add alert callback
      mailmap: add Sebastian Reichel
      power: supply: avoid unused twl4030-madc.h
      power: supply: sbs-battery: Correct supply status with current draw
      power: supply: sbs-battery: Don't ignore the first external power change
      power: supply: pda_power: move from timer to delayed_work
      power: supply: max17042_battery: Add support for the SCOPE property
      power: supply: max17042_battery: Add support for the CHARGE_NOW property
      power: supply: max17042_battery: Add support for the CHARGE_FULL_DESIGN property
      power: supply: max17042_battery: mAh readings depend on r_sns value
      power: supply: max17042_battery: Add support for the VOLT_MIN property
      power: supply: max17042_battery: Add support for the TECHNOLOGY attribute
      power: supply: max17042_battery: Add external_power_changed callback
      power: supply: max17042_battery: Add support for the STATUS property
      power: supply: max17042_battery: Add default platform_data fallback data
      ...
    6b402bdf