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

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

Merge "power_supply: Move battery_type under string properties" into msm-4.14

parents bda2a421 0c9af9f6

drivers/power/supply/power_supply_sysfs.c

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

	POWER_SUPPLY_ATTR(sdp_current_max),

	POWER_SUPPLY_ATTR(connector_type),

	POWER_SUPPLY_ATTR(battery_type),

	POWER_SUPPLY_ATTR(parallel_batfet_mode),

	POWER_SUPPLY_ATTR(parallel_fcc_max),

	POWER_SUPPLY_ATTR(min_icl),
@@ -374,6 +373,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 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_PD_VOLTAGE_MIN,

	POWER_SUPPLY_PROP_SDP_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONNECTOR_TYPE,

	POWER_SUPPLY_PROP_BATTERY_TYPE,

	POWER_SUPPLY_PROP_PARALLEL_BATFET_MODE,

	POWER_SUPPLY_PROP_PARALLEL_FCC_MAX,

	POWER_SUPPLY_PROP_MIN_ICL,
@@ -287,6 +286,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 {