diff options
Diffstat (limited to 'include/linux/power_supply.h')
| -rw-r--r-- | include/linux/power_supply.h | 13 | 
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 3b912bee28d1..0bafbb15f29c 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -109,6 +109,8 @@ enum power_supply_property {  	POWER_SUPPLY_PROP_CHARGE_NOW,  	POWER_SUPPLY_PROP_CHARGE_AVG,  	POWER_SUPPLY_PROP_CHARGE_COUNTER, +	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT, +	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,  	POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,  	POWER_SUPPLY_PROP_ENERGY_EMPTY_DESIGN,  	POWER_SUPPLY_PROP_ENERGY_FULL, @@ -116,9 +118,15 @@ enum power_supply_property {  	POWER_SUPPLY_PROP_ENERGY_NOW,  	POWER_SUPPLY_PROP_ENERGY_AVG,  	POWER_SUPPLY_PROP_CAPACITY, /* in percents! */ +	POWER_SUPPLY_PROP_CAPACITY_ALERT_MIN, /* in percents! */ +	POWER_SUPPLY_PROP_CAPACITY_ALERT_MAX, /* in percents! */  	POWER_SUPPLY_PROP_CAPACITY_LEVEL,  	POWER_SUPPLY_PROP_TEMP, +	POWER_SUPPLY_PROP_TEMP_ALERT_MIN, +	POWER_SUPPLY_PROP_TEMP_ALERT_MAX,  	POWER_SUPPLY_PROP_TEMP_AMBIENT, +	POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MIN, +	POWER_SUPPLY_PROP_TEMP_AMBIENT_ALERT_MAX,  	POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,  	POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,  	POWER_SUPPLY_PROP_TIME_TO_FULL_NOW, @@ -173,6 +181,9 @@ struct power_supply {  	/* private */  	struct device *dev;  	struct work_struct changed_work; +#ifdef CONFIG_THERMAL +	struct thermal_zone_device *tzd; +#endif  #ifdef CONFIG_LEDS_TRIGGERS  	struct led_trigger *charging_full_trig; @@ -236,6 +247,7 @@ static inline bool power_supply_is_amp_property(enum power_supply_property psp)  	case POWER_SUPPLY_PROP_CHARGE_NOW:  	case POWER_SUPPLY_PROP_CHARGE_AVG:  	case POWER_SUPPLY_PROP_CHARGE_COUNTER: +	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT:  	case POWER_SUPPLY_PROP_CURRENT_MAX:  	case POWER_SUPPLY_PROP_CURRENT_NOW:  	case POWER_SUPPLY_PROP_CURRENT_AVG: @@ -263,6 +275,7 @@ static inline bool power_supply_is_watt_property(enum power_supply_property psp)  	case POWER_SUPPLY_PROP_VOLTAGE_NOW:  	case POWER_SUPPLY_PROP_VOLTAGE_AVG:  	case POWER_SUPPLY_PROP_VOLTAGE_OCV: +	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:  	case POWER_SUPPLY_PROP_POWER_NOW:  		return 1;  	default:  | 
