From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 May 2019 01:50:40 +0000 (-0700)
Subject: Merge tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8649efb2f8750dcabff018a27784bab4ecb9f88f;p=android-x86%2Fkernel.git

Merge tag 'for-v5.2' of git://git./linux/kernel/git/sre/linux-power-supply

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
  ...
---

8649efb2f8750dcabff018a27784bab4ecb9f88f
diff --cc drivers/power/supply/Makefile
index b73eb8c5c1a9,70a833863c61..f208273f9686
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@@ -67,10 -68,9 +68,10 @@@ obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_
  obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
  obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
  obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
- obj-$(CONFIG_CHARGER_LTC3651)	+= ltc3651-charger.o
+ obj-$(CONFIG_CHARGER_LT3651)	+= lt3651-charger.o
  obj-$(CONFIG_CHARGER_MAX14577)	+= max14577_charger.o
  obj-$(CONFIG_CHARGER_DETECTOR_MAX14656)	+= max14656_charger_detector.o
 +obj-$(CONFIG_CHARGER_MAX77650)	+= max77650-charger.o
  obj-$(CONFIG_CHARGER_MAX77693)	+= max77693_charger.o
  obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o
  obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o