aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/power_supply.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/power_supply.h')
-rw-r--r--include/linux/power_supply.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 0bafbb15f29..1f0ab90aff0 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -88,6 +88,7 @@ enum power_supply_property {
88 POWER_SUPPLY_PROP_HEALTH, 88 POWER_SUPPLY_PROP_HEALTH,
89 POWER_SUPPLY_PROP_PRESENT, 89 POWER_SUPPLY_PROP_PRESENT,
90 POWER_SUPPLY_PROP_ONLINE, 90 POWER_SUPPLY_PROP_ONLINE,
91 POWER_SUPPLY_PROP_AUTHENTIC,
91 POWER_SUPPLY_PROP_TECHNOLOGY, 92 POWER_SUPPLY_PROP_TECHNOLOGY,
92 POWER_SUPPLY_PROP_CYCLE_COUNT, 93 POWER_SUPPLY_PROP_CYCLE_COUNT,
93 POWER_SUPPLY_PROP_VOLTAGE_MAX, 94 POWER_SUPPLY_PROP_VOLTAGE_MAX,
@@ -110,7 +111,11 @@ enum power_supply_property {
110 POWER_SUPPLY_PROP_CHARGE_AVG, 111 POWER_SUPPLY_PROP_CHARGE_AVG,
111 POWER_SUPPLY_PROP_CHARGE_COUNTER, 112 POWER_SUPPLY_PROP_CHARGE_COUNTER,
112 POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT, 113 POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT,
114 POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
113 POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE, 115 POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
116 POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
117 POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
118 POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
114 POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN, 119 POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
115 POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN, 120 POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,
116 POWER_SUPPLY_PROP_ENERGY_FULL, 121 POWER_SUPPLY_PROP_ENERGY_FULL,
@@ -183,6 +188,7 @@ struct power_supply {
183 struct work_struct changed_work; 188 struct work_struct changed_work;
184#ifdef CONFIG_THERMAL 189#ifdef CONFIG_THERMAL
185 struct thermal_zone_device *tzd; 190 struct thermal_zone_device *tzd;
191 struct thermal_cooling_device *tcd;
186#endif 192#endif
187 193
188#ifdef CONFIG_LEDS_TRIGGERS 194#ifdef CONFIG_LEDS_TRIGGERS
@@ -248,6 +254,7 @@ static inline bool power_supply_is_amp_property(enum power_supply_property psp)
248 case POWER_SUPPLY_PROP_CHARGE_AVG: 254 case POWER_SUPPLY_PROP_CHARGE_AVG:
249 case POWER_SUPPLY_PROP_CHARGE_COUNTER: 255 case POWER_SUPPLY_PROP_CHARGE_COUNTER:
250 case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT: 256 case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:
257 case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
251 case POWER_SUPPLY_PROP_CURRENT_MAX: 258 case POWER_SUPPLY_PROP_CURRENT_MAX:
252 case POWER_SUPPLY_PROP_CURRENT_NOW: 259 case POWER_SUPPLY_PROP_CURRENT_NOW:
253 case POWER_SUPPLY_PROP_CURRENT_AVG: 260 case POWER_SUPPLY_PROP_CURRENT_AVG:
@@ -276,6 +283,7 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp)
276 case POWER_SUPPLY_PROP_VOLTAGE_AVG: 283 case POWER_SUPPLY_PROP_VOLTAGE_AVG:
277 case POWER_SUPPLY_PROP_VOLTAGE_OCV: 284 case POWER_SUPPLY_PROP_VOLTAGE_OCV:
278 case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE: 285 case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
286 case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
279 case POWER_SUPPLY_PROP_POWER_NOW: 287 case POWER_SUPPLY_PROP_POWER_NOW:
280 return 1; 288 return 1;
281 default: 289 default: