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

Commit c864d05f authored by Harry Yang's avatar Harry Yang
Browse files

power: supply: Add snapshot of power supply changes 



Add snapshot of power supply changes as of kernel 4.9
'commit fc9ce0e0a100 ("Merge changes  into msm-4.9")'.

The following commits are included:
	eb72684  add POWER_SUPPLY_PROP_USB_CONNECTOR_TYPE property
	7b8a3ee  add POWER_SUPPLY_PROP_{COLD,HOT}_TEMP properties
	e552a1d  add properties for SDP current and PD voltage
	8ae23a5  add property for sw based JEITA
	0d8716a  add CC_STEP and CC_STEP_SEL properties
	4e56cab  power_supply_sysfs: Add support for Floating charger
	e43bacd  introduce PR_SWAP property
	e8615ac  Add REAL_TYPE power_supply_property
	104edd8  add HW_CURRENT_MAX power_supply property
	71a8d3e  add CHARGE_QNOVO_ENABLE property
	ec6af84  qcom-charger: add support for internal and external rsense
	7fdbd2e  supply: qcom: implement die and connector health property
	9a3a6c3  Add type and properties for parallel charger
	5bb8e7f  add INPUT_VOLTAGE_SETTLED property
	a22224c  Add CURRENT_QNOVO and VOLTAGE_QNOVO properties
	6b85914  add CTM_CURRENT_MAX property
	86cc4f6  add DIE_HEALTH and CONNECTOR_HEALTH properties
	ad8dc15  add PARALLEL_PERCENT property
	549fcde  add PARALLEL_DISABLE property
	878ba2b  add two properties for step charging
	cf50b0c  add PIN_ENABLED property
	0fa3185  add CHARGER_TEMP and CHARGER_TEMP_MAX properties
	2416311  add INPUT_SUSPEND power supply property
	dcdf2fc  supply: snapshot of power supply files
	540f4eb  Add RESISTANCE property to power supply
	4a8b501  supply: Add property to vote for TLIM
	8b4a56f  Add BOOST_CURRENT property
	6d3ad96  Add PE_START property
	2f3c825  Add additional USB PD properties
	d8c9b78  Add additional USB Type-C properties

Also, modify the property names to match with upstream convention.

Signed-off-by: default avatarHarry Yang <harryy@codeaurora.org>
Change-Id: I170548d6a0ee92ed1f93ef55776fd334711c7214
parent bc9054b6

drivers/power/supply/power_supply_sysfs.c

+109 −3
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ static struct device_attribute power_supply_attrs[]; 
static const char * const power_supply_type_text[] = {

	"Unknown", "Battery", "UPS", "Mains", "USB",

	"USB_DCP", "USB_CDP", "USB_ACA", "USB_C",

	"USB_PD", "USB_PD_DRP", "BrickID"

	"USB_PD", "USB_PD_DRP", "BrickID",

	"USB_HVDCP", "USB_HVDCP_3", "Wireless", "USB_FLOAT",

	"BMS", "Parallel", "Main", "Wipower", "USB_C_UFP", "USB_C_DFP",

};



static const char * const power_supply_status_text[] = {
@@ -51,13 +53,14 @@ static const char * const power_supply_status_text[] = { 
};



static const char * const power_supply_charge_type_text[] = {

	"Unknown", "N/A", "Trickle", "Fast"

	"Unknown", "N/A", "Trickle", "Fast", "Taper"

};



static const char * const power_supply_health_text[] = {

	"Unknown", "Good", "Overheat", "Dead", "Over voltage",

	"Unspecified failure", "Cold", "Watchdog timer expire",

	"Safety timer expire"

	"Safety timer expire",

	"Warm", "Cool", "Hot"

};



static const char * const power_supply_technology_text[] = {
@@ -73,6 +76,19 @@ static const char * const power_supply_scope_text[] = { 
	"Unknown", "System", "Device"

};



static const char * const power_supply_usbc_text[] = {

	"Nothing attached", "Sink attached", "Powered cable w/ sink",

	"Debug Accessory", "Audio Adapter", "Powered cable w/o sink",

	"Source attached (default current)",

	"Source attached (medium current)",

	"Source attached (high current)",

	"Non compliant",

};



static const char * const power_supply_usbc_pr_text[] = {

	"none", "dual power role", "sink", "source"

};



static ssize_t power_supply_show_property(struct device *dev,

					  struct device_attribute *attr,

					  char *buf) {
@@ -119,6 +135,18 @@ static ssize_t power_supply_show_property(struct device *dev, 
	else if (off == POWER_SUPPLY_PROP_SCOPE)

		return sprintf(buf, "%s\n",

			       power_supply_scope_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_TYPEC_MODE)

		return scnprintf(buf, PAGE_SIZE, "%s\n",

			       power_supply_usbc_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_TYPEC_POWER_ROLE)

		return scnprintf(buf, PAGE_SIZE, "%s\n",

			       power_supply_usbc_pr_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_DIE_HEALTH)

		return scnprintf(buf, PAGE_SIZE, "%s\n",

			       power_supply_health_text[value.intval]);

	else if (off == POWER_SUPPLY_PROP_CONNECTOR_HEALTH)

		return scnprintf(buf, PAGE_SIZE, "%s\n",

			       power_supply_health_text[value.intval]);

	else if (off >= POWER_SUPPLY_PROP_MODEL_NAME)

		return sprintf(buf, "%s\n", value.strval);
@@ -255,6 +283,84 @@ static struct device_attribute power_supply_attrs[] = { 
	POWER_SUPPLY_ATTR(charge_enabled),

	POWER_SUPPLY_ATTR(set_ship_mode),

	POWER_SUPPLY_ATTR(real_type),

	POWER_SUPPLY_ATTR(charge_now_raw),

	POWER_SUPPLY_ATTR(charge_now_error),

	POWER_SUPPLY_ATTR(capacity_raw),

	POWER_SUPPLY_ATTR(battery_charging_enabled),

	POWER_SUPPLY_ATTR(charging_enabled),

	POWER_SUPPLY_ATTR(step_charging_enabled),

	POWER_SUPPLY_ATTR(step_charging_step),

	POWER_SUPPLY_ATTR(pin_enabled),

	POWER_SUPPLY_ATTR(input_suspend),

	POWER_SUPPLY_ATTR(input_voltage_regulation),

	POWER_SUPPLY_ATTR(input_current_max),

	POWER_SUPPLY_ATTR(input_current_trim),

	POWER_SUPPLY_ATTR(input_current_settled),

	POWER_SUPPLY_ATTR(input_voltage_settled),

	POWER_SUPPLY_ATTR(bypass_vchg_loop_debouncer),

	POWER_SUPPLY_ATTR(charge_counter_shadow),

	POWER_SUPPLY_ATTR(hi_power),

	POWER_SUPPLY_ATTR(low_power),

	POWER_SUPPLY_ATTR(temp_cool),

	POWER_SUPPLY_ATTR(temp_warm),

	POWER_SUPPLY_ATTR(temp_cold),

	POWER_SUPPLY_ATTR(temp_hot),

	POWER_SUPPLY_ATTR(system_temp_level),

	POWER_SUPPLY_ATTR(resistance),

	POWER_SUPPLY_ATTR(resistance_capacitive),

	POWER_SUPPLY_ATTR(resistance_id),

	POWER_SUPPLY_ATTR(resistance_now),

	POWER_SUPPLY_ATTR(flash_current_max),

	POWER_SUPPLY_ATTR(update_now),

	POWER_SUPPLY_ATTR(esr_count),

	POWER_SUPPLY_ATTR(buck_freq),

	POWER_SUPPLY_ATTR(boost_current),

	POWER_SUPPLY_ATTR(safety_timer_enabled),

	POWER_SUPPLY_ATTR(charge_done),

	POWER_SUPPLY_ATTR(flash_active),

	POWER_SUPPLY_ATTR(flash_trigger),

	POWER_SUPPLY_ATTR(force_tlim),

	POWER_SUPPLY_ATTR(dp_dm),

	POWER_SUPPLY_ATTR(input_current_limited),

	POWER_SUPPLY_ATTR(input_current_now),

	POWER_SUPPLY_ATTR(charge_qnovo_enable),

	POWER_SUPPLY_ATTR(current_qnovo),

	POWER_SUPPLY_ATTR(voltage_qnovo),

	POWER_SUPPLY_ATTR(rerun_aicl),

	POWER_SUPPLY_ATTR(cycle_count_id),

	POWER_SUPPLY_ATTR(safety_timer_expired),

	POWER_SUPPLY_ATTR(restricted_charging),

	POWER_SUPPLY_ATTR(current_capability),

	POWER_SUPPLY_ATTR(typec_mode),

	POWER_SUPPLY_ATTR(typec_cc_orientation),

	POWER_SUPPLY_ATTR(typec_power_role),

	POWER_SUPPLY_ATTR(pd_allowed),

	POWER_SUPPLY_ATTR(pd_active),

	POWER_SUPPLY_ATTR(pd_in_hard_reset),

	POWER_SUPPLY_ATTR(pd_current_max),

	POWER_SUPPLY_ATTR(pd_usb_suspend_supported),

	POWER_SUPPLY_ATTR(charger_temp),

	POWER_SUPPLY_ATTR(charger_temp_max),

	POWER_SUPPLY_ATTR(parallel_disable),

	POWER_SUPPLY_ATTR(pe_start),

	POWER_SUPPLY_ATTR(soc_reporting_ready),

	POWER_SUPPLY_ATTR(debug_battery),

	POWER_SUPPLY_ATTR(fcc_delta),

	POWER_SUPPLY_ATTR(icl_reduction),

	POWER_SUPPLY_ATTR(parallel_mode),

	POWER_SUPPLY_ATTR(die_health),

	POWER_SUPPLY_ATTR(connector_health),

	POWER_SUPPLY_ATTR(ctm_current_max),

	POWER_SUPPLY_ATTR(hw_current_max),

	POWER_SUPPLY_ATTR(pr_swap),

	POWER_SUPPLY_ATTR(cc_step),

	POWER_SUPPLY_ATTR(cc_step_sel),

	POWER_SUPPLY_ATTR(sw_jeita_enabled),

	POWER_SUPPLY_ATTR(pd_voltage_max),

	POWER_SUPPLY_ATTR(pd_voltage_min),

	POWER_SUPPLY_ATTR(sdp_current_max),

	POWER_SUPPLY_ATTR(connector_type),

	POWER_SUPPLY_ATTR(battery_type),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

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

include/linux/power_supply.h

+145 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ enum { 
	POWER_SUPPLY_CHARGE_TYPE_NONE,

	POWER_SUPPLY_CHARGE_TYPE_TRICKLE,

	POWER_SUPPLY_CHARGE_TYPE_FAST,

	POWER_SUPPLY_CHARGE_TYPE_TAPER,

};



enum {
@@ -58,6 +59,9 @@ enum { 
	POWER_SUPPLY_HEALTH_COLD,

	POWER_SUPPLY_HEALTH_WATCHDOG_TIMER_EXPIRE,

	POWER_SUPPLY_HEALTH_SAFETY_TIMER_EXPIRE,

	POWER_SUPPLY_HEALTH_WARM,

	POWER_SUPPLY_HEALTH_COOL,

	POWER_SUPPLY_HEALTH_HOT,

};



enum {
@@ -85,6 +89,34 @@ enum { 
	POWER_SUPPLY_SCOPE_DEVICE,

};



enum {

	POWER_SUPPLY_DP_DM_UNKNOWN = 0,

	POWER_SUPPLY_DP_DM_PREPARE = 1,

	POWER_SUPPLY_DP_DM_UNPREPARE = 2,

	POWER_SUPPLY_DP_DM_CONFIRMED_HVDCP3 = 3,

	POWER_SUPPLY_DP_DM_DP_PULSE = 4,

	POWER_SUPPLY_DP_DM_DM_PULSE = 5,

	POWER_SUPPLY_DP_DM_DP0P6_DMF = 6,

	POWER_SUPPLY_DP_DM_DP0P6_DM3P3 = 7,

	POWER_SUPPLY_DP_DM_DPF_DMF = 8,

	POWER_SUPPLY_DP_DM_DPR_DMR = 9,

	POWER_SUPPLY_DP_DM_HVDCP3_SUPPORTED = 10,

	POWER_SUPPLY_DP_DM_ICL_DOWN = 11,

	POWER_SUPPLY_DP_DM_ICL_UP = 12,

};



enum {

	POWER_SUPPLY_PL_NONE,

	POWER_SUPPLY_PL_USBIN_USBIN,

	POWER_SUPPLY_PL_USBIN_USBIN_EXT,

	POWER_SUPPLY_PL_USBMID_USBMID,

};



enum {

	POWER_SUPPLY_CONNECTOR_TYPEC,

	POWER_SUPPLY_CONNECTOR_MICRO_USB,

};



enum power_supply_property {

	/* Properties of type `int' */

	POWER_SUPPLY_PROP_STATUS = 0,
@@ -156,6 +188,84 @@ enum power_supply_property { 
	POWER_SUPPLY_PROP_CHARGE_ENABLED,

	POWER_SUPPLY_PROP_SET_SHIP_MODE,

	POWER_SUPPLY_PROP_REAL_TYPE,

	POWER_SUPPLY_PROP_CHARGE_NOW_RAW,

	POWER_SUPPLY_PROP_CHARGE_NOW_ERROR,

	POWER_SUPPLY_PROP_CAPACITY_RAW,

	POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_STEP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_STEP_CHARGING_STEP,

	POWER_SUPPLY_PROP_PIN_ENABLED,

	POWER_SUPPLY_PROP_INPUT_SUSPEND,

	POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,

	POWER_SUPPLY_PROP_INPUT_CURRENT_MAX,

	POWER_SUPPLY_PROP_INPUT_CURRENT_TRIM,

	POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED,

	POWER_SUPPLY_PROP_INPUT_VOLTAGE_SETTLED,

	POWER_SUPPLY_PROP_VCHG_LOOP_DBC_BYPASS,

	POWER_SUPPLY_PROP_CHARGE_COUNTER_SHADOW,

	POWER_SUPPLY_PROP_HI_POWER,

	POWER_SUPPLY_PROP_LOW_POWER,

	POWER_SUPPLY_PROP_COOL_TEMP,

	POWER_SUPPLY_PROP_WARM_TEMP,

	POWER_SUPPLY_PROP_COLD_TEMP,

	POWER_SUPPLY_PROP_HOT_TEMP,

	POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL,

	POWER_SUPPLY_PROP_RESISTANCE,

	POWER_SUPPLY_PROP_RESISTANCE_CAPACITIVE,

	POWER_SUPPLY_PROP_RESISTANCE_ID, /* in Ohms */

	POWER_SUPPLY_PROP_RESISTANCE_NOW,

	POWER_SUPPLY_PROP_FLASH_CURRENT_MAX,

	POWER_SUPPLY_PROP_UPDATE_NOW,

	POWER_SUPPLY_PROP_ESR_COUNT,

	POWER_SUPPLY_PROP_BUCK_FREQ,

	POWER_SUPPLY_PROP_BOOST_CURRENT,

	POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE,

	POWER_SUPPLY_PROP_CHARGE_DONE,

	POWER_SUPPLY_PROP_FLASH_ACTIVE,

	POWER_SUPPLY_PROP_FLASH_TRIGGER,

	POWER_SUPPLY_PROP_FORCE_TLIM,

	POWER_SUPPLY_PROP_DP_DM,

	POWER_SUPPLY_PROP_INPUT_CURRENT_LIMITED,

	POWER_SUPPLY_PROP_INPUT_CURRENT_NOW,

	POWER_SUPPLY_PROP_CHARGE_QNOVO_ENABLE,

	POWER_SUPPLY_PROP_CURRENT_QNOVO,

	POWER_SUPPLY_PROP_VOLTAGE_QNOVO,

	POWER_SUPPLY_PROP_RERUN_AICL,

	POWER_SUPPLY_PROP_CYCLE_COUNT_ID,

	POWER_SUPPLY_PROP_SAFETY_TIMER_EXPIRED,

	POWER_SUPPLY_PROP_RESTRICTED_CHARGING,

	POWER_SUPPLY_PROP_CURRENT_CAPABILITY,

	POWER_SUPPLY_PROP_TYPEC_MODE,

	POWER_SUPPLY_PROP_TYPEC_CC_ORIENTATION, /* 0: N/C, 1: CC1, 2: CC2 */

	POWER_SUPPLY_PROP_TYPEC_POWER_ROLE,

	POWER_SUPPLY_PROP_PD_ALLOWED,

	POWER_SUPPLY_PROP_PD_ACTIVE,

	POWER_SUPPLY_PROP_PD_IN_HARD_RESET,

	POWER_SUPPLY_PROP_PD_CURRENT_MAX,

	POWER_SUPPLY_PROP_PD_USB_SUSPEND_SUPPORTED,

	POWER_SUPPLY_PROP_CHARGER_TEMP,

	POWER_SUPPLY_PROP_CHARGER_TEMP_MAX,

	POWER_SUPPLY_PROP_PARALLEL_DISABLE,

	POWER_SUPPLY_PROP_PE_START,

	POWER_SUPPLY_PROP_SOC_REPORTING_READY,

	POWER_SUPPLY_PROP_DEBUG_BATTERY,

	POWER_SUPPLY_PROP_FCC_DELTA,

	POWER_SUPPLY_PROP_ICL_REDUCTION,

	POWER_SUPPLY_PROP_PARALLEL_MODE,

	POWER_SUPPLY_PROP_DIE_HEALTH,

	POWER_SUPPLY_PROP_CONNECTOR_HEALTH,

	POWER_SUPPLY_PROP_CTM_CURRENT_MAX,

	POWER_SUPPLY_PROP_HW_CURRENT_MAX,

	POWER_SUPPLY_PROP_PR_SWAP,

	POWER_SUPPLY_PROP_CC_STEP,

	POWER_SUPPLY_PROP_CC_STEP_SEL,

	POWER_SUPPLY_PROP_SW_JEITA_ENABLED,

	POWER_SUPPLY_PROP_PD_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_PD_VOLTAGE_MIN,

	POWER_SUPPLY_PROP_SDP_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONNECTOR_TYPE,

	POWER_SUPPLY_PROP_BATTERY_TYPE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

	/* Properties of type `const char *' */
@@ -177,6 +287,41 @@ enum power_supply_type { 
	POWER_SUPPLY_TYPE_USB_PD,		/* Power Delivery Port */

	POWER_SUPPLY_TYPE_USB_PD_DRP,		/* PD Dual Role Port */

	POWER_SUPPLY_TYPE_APPLE_BRICK_ID,	/* Apple Charging Method */

	POWER_SUPPLY_TYPE_USB_HVDCP,		/* High Voltage DCP */

	POWER_SUPPLY_TYPE_USB_HVDCP_3,		/* Efficient High Voltage DCP */

	POWER_SUPPLY_TYPE_WIRELESS,		/* Accessory Charger Adapters */

	POWER_SUPPLY_TYPE_USB_FLOAT,		/* Floating charger */

	POWER_SUPPLY_TYPE_BMS,			/* Battery Monitor System */

	POWER_SUPPLY_TYPE_PARALLEL,		/* Parallel Path */

	POWER_SUPPLY_TYPE_MAIN,			/* Main Path */

	POWER_SUPPLY_TYPE_WIPOWER,		/* Wipower */

	POWER_SUPPLY_TYPE_UFP,			/* Type-C UFP */

	POWER_SUPPLY_TYPE_DFP,			/* Type-C DFP */

};



/* Indicates USB Type-C CC connection status */

enum power_supply_typec_mode {

	POWER_SUPPLY_TYPEC_NONE,



	/* Acting as source */

	POWER_SUPPLY_TYPEC_SINK,		/* Rd only */

	POWER_SUPPLY_TYPEC_SINK_POWERED_CABLE,	/* Rd/Ra */

	POWER_SUPPLY_TYPEC_SINK_DEBUG_ACCESSORY,/* Rd/Rd */

	POWER_SUPPLY_TYPEC_SINK_AUDIO_ADAPTER,	/* Ra/Ra */

	POWER_SUPPLY_TYPEC_POWERED_CABLE_ONLY,	/* Ra only */



	/* Acting as sink */

	POWER_SUPPLY_TYPEC_SOURCE_DEFAULT,	/* Rp default */

	POWER_SUPPLY_TYPEC_SOURCE_MEDIUM,	/* Rp 1.5A */

	POWER_SUPPLY_TYPEC_SOURCE_HIGH,		/* Rp 3A */

	POWER_SUPPLY_TYPEC_NON_COMPLIANT,

};



enum power_supply_typec_power_role {

	POWER_SUPPLY_TYPEC_PR_NONE,		/* CC lines in high-Z */

	POWER_SUPPLY_TYPEC_PR_DUAL,

	POWER_SUPPLY_TYPEC_PR_SINK,

	POWER_SUPPLY_TYPEC_PR_SOURCE,

};



enum power_supply_notifier_events {