Merge tag 'for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply and reset updates from Sebastian Reichel:
 "Power-supply core:
   - introduce LOAD_SWITCH property
   - pack power_supply_desc to optimize memory
   - prevent power-supply device unregistration while callback runs
   - drop last CONFIG_OF build-time dependencies from the core
   - documentation fixes

  Power-supply drivers:
   - bq27xxx: add support for bq27z746, bq28z620
   - ab8500: add AB8505 support
   - bq257xx: fix probe time configuration race condition
   - multiple: convert drivers with custom LOAD_SWITCH properties to the
     new standard one
   - cros_charge-control: restore EC state on resume
   - qcom_battmgr: fix USB type reporting, notify charger online state,
     report full batteries and correct capacity on X1E
   - gpio-charger: always report as discharging if input power is
     missing
   - bq24190_charger: don't reset registers across system suspend
   - qcom_smbx: a lot of independent fixes
   - lots of error and module removal path fixes
   - misc fixes

  Reset drivers
   - misc fixes"

* tag 'for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (77 commits)
  power: supply: gpio-charger: Report discharging without input power
  power: supply: qcom_battmgr: report full batteries
  power_supply: serialize property access with unregister
  power: supply: bq257xx: Describe the dev field in the driver data structure
  power: supply: qcom_battmgr: Notify charger supplies of online changes
  power: supply: generic-adc-battery: fix status with no supplier
  power: supply: qcom_battmgr: report the USB type from USB_ADAP_TYPE
  power: supply: sysfs: Ratelimit "unavailable enum value" warning
  power: supply: cros_charge-control: restore EC state on resume
  power: supply: qcom_smbx: set the charge enable after software control
  power: supply: generic-adc-battery: Propagate charged GPIO errors
  power: supply: sbs-battery: disable polling before supply teardown
  power: supply: pf1550: drain IRQ work before unregistering supplies
  power: supply: bq256xx: Expose VBUS state through extcon
  power: supply: ab8500_fg: Avoid reserved AB8505 CCConf bit
  power: supply: ab8500_fg: Finalize current measurements
  power: supply: ab8500_charger: Recover inactive AB8505 charger
  power: supply: ab8500_charger: Retry AB8505 USB detection
  power: supply: ab8500_charger: Skip absent AB8505 main charger
  power: supply: ab8500_charger: Handle detection errors
  ...

2 files changed, 17 insertions, 3 deletions

diff --git a/include/linux/power/bq27xxx_battery.h b/include/linux/power/bq27xxx_battery.h
index d56e1276aafe..731ea837aac3 100644
--- a/include/linux/power/bq27xxx_battery.h
+++ b/include/linux/power/bq27xxx_battery.h
@@ -33,7 +33,9 @@ enum bq27xxx_chip {
 	BQ27441,
 	BQ27621,
 	BQ27Z561,
+	BQ27Z746,
 	BQ28Z610,
+	BQ28Z620,
 	BQ34Z100,
 	BQ78Z100,
 };
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 0a4ea490d5ea..cce61137aef4 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -104,6 +104,14 @@ enum {
 	POWER_SUPPLY_SCOPE_DEVICE,
 };
 
+enum {
+	POWER_SUPPLY_LOAD_SWITCH_UNKNOWN = 0,
+	POWER_SUPPLY_LOAD_SWITCH_ON,
+	POWER_SUPPLY_LOAD_SWITCH_OFF,
+	POWER_SUPPLY_LOAD_SWITCH_STANDBY,
+	POWER_SUPPLY_LOAD_SWITCH_SHIP,
+};
+
 enum power_supply_property {
 	/* Properties of type `int' */
 	POWER_SUPPLY_PROP_STATUS = 0,
@@ -182,6 +190,7 @@ enum power_supply_property {
 	POWER_SUPPLY_PROP_MANUFACTURE_DAY,
 	POWER_SUPPLY_PROP_INTERNAL_RESISTANCE,
 	POWER_SUPPLY_PROP_STATE_OF_HEALTH,
+	POWER_SUPPLY_PROP_LOAD_SWITCH,
 	/* Properties of type `const char *' */
 	POWER_SUPPLY_PROP_MODEL_NAME,
 	POWER_SUPPLY_PROP_MANUFACTURER,
@@ -259,9 +268,9 @@ struct power_supply_config {
 struct power_supply_desc {
 	const char *name;
 	enum power_supply_type type;
-	u8 charge_behaviours;
 	u32 charge_types;
 	u32 usb_types;
+	u32 load_switches;
 	const enum power_supply_property *properties;
 	size_t num_properties;
 
@@ -295,14 +304,17 @@ struct power_supply_desc {
 	 */
 	int (*init)(struct power_supply *psy);
 
+	/* For APM emulation, think legacy userspace. */
+	int use_for_apm;
+
 	/*
 	 * Set if thermal zone should not be created for this power supply.
 	 * For example for virtual supplies forwarding calls to actual
 	 * sensors or other supplies.
 	 */
 	bool no_thermal;
-	/* For APM emulation, think legacy userspace. */
-	int use_for_apm;
+
+	u8 charge_behaviours;
 };
 
 struct power_supply_ext {