Merge tag 'for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

Pull power supply and reset updates from Sebastian Reichel:

 - New core support:
    - battery internal resistance
    - battery OCV capacity lookup table
    - support for custom sysfs attributes

 - Convert all drivers to use power-supply core support for custom sysfs
   attributes

 - bq24190-charger: bq24196 support

 - axp20x-charger: AXP813 support

 - sc27xx-battery: new fuel gauge driver

 - gpio-poweroff: support for specific active and inactive delays

 - Misc fixes

* tag 'for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (53 commits)
  power: supply: bq25890: fix BAT_COMP field definition
  power: supply: gpio-charger: Do not use deprecated POWER_SUPPLY_TYPE_USB_*
  power: supply: ds2781: switch to devm_power_supply_register
  power: supply: ds2780: switch to devm_power_supply_register
  power: supply: ds2781: fix race-condition in bin attribute registration
  power: supply: ds2780: fix race-condition in bin attribute registration
  power: supply: pcf50633: fix race-condition in sysfs registration
  power: supply: charger-manager: fix race-condition in sysfs registration
  power: supply: charger-manager: simplify generation of sysfs attribute group name
  power: supply: bq24257: fix race-condition in sysfs registration
  power: supply: bq24190_charger: fix race-condition in sysfs registration
  power: supply: lp8788: fix race-condition in sysfs registration
  power: supply: ds2781: fix race-condition in sysfs registration
  power: supply: ds2780: fix race-condition in sysfs registration
  power: supply: bq2415x: fix race-condition in sysfs registration
  power: supply: core: add support for custom sysfs attributes
  power: supply: sc27xx: Save last battery capacity
  power: reset: at91-poweroff: move shdwc related data to one structure
  power: supply: sc27xx: Add suspend/resume interfaces
  power: supply: sc27xx: Add fuel gauge low voltage alarm
  ...

diff --combined include/linux/mfd/axp20x.h
index 1293695,2302b62..a353cd2
--- 1/include/linux/mfd/axp20x.h
--- 2/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@@ -35,7 -35,7 +35,7 @@@ enum axp20x_variants 
  #define AXP152_ALDO_OP_MODE           0x13
  #define AXP152_LDO0_CTRL              0x15
  #define AXP152_DCDC2_V_OUT            0x23
 -#define AXP152_DCDC2_V_SCAL           0x25
 +#define AXP152_DCDC2_V_RAMP           0x25
  #define AXP152_DCDC1_V_OUT            0x26
  #define AXP152_DCDC3_V_OUT            0x27
  #define AXP152_ALDO12_V_OUT           0x28
@@@ -53,7 -53,7 +53,7 @@@
  #define AXP20X_USB_OTG_STATUS         0x02
  #define AXP20X_PWR_OUT_CTRL           0x12
  #define AXP20X_DCDC2_V_OUT            0x23
 -#define AXP20X_DCDC2_LDO3_V_SCAL      0x25
 +#define AXP20X_DCDC2_LDO3_V_RAMP      0x25
  #define AXP20X_DCDC3_V_OUT            0x27
  #define AXP20X_LDO24_V_OUT            0x28
  #define AXP20X_LDO3_V_OUT             0x29
@@@ -266,6 -266,7 +266,7 @@@
  #define AXP288_RT_BATT_V_H            0xa0
  #define AXP288_RT_BATT_V_L            0xa1
  
+ #define AXP813_ACIN_PATH_CTRL         0x3a
  #define AXP813_ADC_RATE                       0x85
  
  /* Fuel Gauge */