Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 5 insertions, 0 deletions

diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 0bafbb15f29c..e5ef45834c3c 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -88,6 +88,7 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_HEALTH,
         POWER_SUPPLY_PROP_PRESENT,
         POWER_SUPPLY_PROP_ONLINE,
+        POWER_SUPPLY_PROP_AUTHENTIC,
         POWER_SUPPLY_PROP_TECHNOLOGY,
         POWER_SUPPLY_PROP_CYCLE_COUNT,
         POWER_SUPPLY_PROP_VOLTAGE_MAX,
@@ -110,7 +111,9 @@ enum power_supply_property {
         POWER_SUPPLY_PROP_CHARGE_AVG,
         POWER_SUPPLY_PROP_CHARGE_COUNTER,
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
         POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
+        POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
         POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
         POWER_SUPPLY_PROP_ENERGY_FULL,
@@ -248,6 +251,7 @@ static inline bool power_supply_is_amp_property(enum power_supply_property psp)
         case POWER_SUPPLY_PROP_CHARGE_AVG:
         case POWER_SUPPLY_PROP_CHARGE_COUNTER:
         case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
         case POWER_SUPPLY_PROP_CURRENT_MAX:
         case POWER_SUPPLY_PROP_CURRENT_NOW:
         case POWER_SUPPLY_PROP_CURRENT_AVG:
@@ -276,6 +280,7 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp)
         case POWER_SUPPLY_PROP_VOLTAGE_AVG:
         case POWER_SUPPLY_PROP_VOLTAGE_OCV:
         case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
+        case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
         case POWER_SUPPLY_PROP_POWER_NOW:
                 return 1;
         default: