UPSTREAM: PCI: rockchip: Provide captured slot power limit and scale

[firefly-linux-kernel-4.4.55.git] / include / linux / power_supply.h

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 1c075892c6fdfb10518a52521c23e8a4e5f130b0..3241026e49f6863a94e616c84eea431d2c205786 100644 (file)
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -170,6 +170,7 @@ enum power_supply_type {
        POWER_SUPPLY_TYPE_USB_DCP,      /* Dedicated Charging Port */
        POWER_SUPPLY_TYPE_USB_CDP,      /* Charging Downstream Port */
        POWER_SUPPLY_TYPE_USB_ACA,      /* Accessory Charger Adapters */
+       POWER_SUPPLY_TYPE_USB_FLOATING, /* DCP without shorting D+/D- */
 };
 
 enum power_supply_notifier_events {
@@ -253,6 +254,7 @@ struct power_supply {
        struct delayed_work deferred_register_work;
        spinlock_t changed_lock;
        bool changed;
+       bool initialized;
        atomic_t use_cnt;
 #ifdef CONFIG_THERMAL
        struct thermal_zone_device *tzd;