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

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

Merge changes I857c59ba,Iacb28b04,I3a6ed44f into msm-4.14 

* changes:
  power_supply: Add BATT_PROFILE_VERSION property
  power_supply: Add BATT_FULL and RECHARGE_SOC properties
  power_supply: add POWER_SUPPLY properties to be used by charger driver
parents 15d5e954 da3dee46

drivers/power/supply/power_supply_sysfs.c

+7 −0
Original line number Diff line number Diff line
@@ -361,6 +361,13 @@ static struct device_attribute power_supply_attrs[] = { 
	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),

	POWER_SUPPLY_ATTR(moisture_detected),

	POWER_SUPPLY_ATTR(batt_profile_version),

	POWER_SUPPLY_ATTR(batt_full_current),

	POWER_SUPPLY_ATTR(recharge_soc),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

	/* Properties of type `const char *' */

include/linux/power_supply.h

+12 −0
Original line number Diff line number Diff line
@@ -120,6 +120,11 @@ enum { 
	POWER_SUPPLY_CONNECTOR_MICRO_USB,

};



enum {

	POWER_SUPPLY_PL_STACKED_BATFET,

	POWER_SUPPLY_PL_NON_STACKED_BATFET,

};



enum power_supply_property {

	/* Properties of type `int' */

	POWER_SUPPLY_PROP_STATUS = 0,
@@ -269,6 +274,13 @@ enum power_supply_property { 
	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,

	POWER_SUPPLY_PROP_MOISTURE_DETECTED,

	POWER_SUPPLY_PROP_BATT_PROFILE_VERSION,

	POWER_SUPPLY_PROP_BATT_FULL_CURRENT,

	POWER_SUPPLY_PROP_RECHARGE_SOC,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

	/* Properties of type `const char *' */