Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36971a95 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: power_supply: Add POWER_SUPPLY_PROP_BATTERY_TYPE property"

parents 20f5f00f 3732b122

drivers/power/power_supply_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(model_name),

	POWER_SUPPLY_ATTR(manufacturer),

	POWER_SUPPLY_ATTR(serial_number),

	POWER_SUPPLY_ATTR(battery_type),

};



static struct attribute *

include/linux/power_supply.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_MODEL_NAME,

	POWER_SUPPLY_PROP_MANUFACTURER,

	POWER_SUPPLY_PROP_SERIAL_NUMBER,

	POWER_SUPPLY_PROP_BATTERY_TYPE,

};



enum power_supply_type {