Merge "power_supply: add property to disable QC userspace optimizations" (7fcbb18d) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/power/supply/power_supply_sysfs.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -338,6 +338,7 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(esr_actual),
		POWER_SUPPLY_ATTR(esr_nominal),
		POWER_SUPPLY_ATTR(soh),
		POWER_SUPPLY_ATTR(qc_opti_disable),
		/* Local extensions of type int64_t */
		POWER_SUPPLY_ATTR(charge_counter_ext),
		/* Properties of type `const char ' /

+7 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,12 @@ enum {
		POWER_SUPPLY_PD_PPS_ACTIVE,
		};

		enum {
		POWER_SUPPLY_QC_CTM_DISABLE = BIT(0),
		POWER_SUPPLY_QC_THERMAL_BALANCE_DISABLE = BIT(1),
		POWER_SUPPLY_QC_INOV_THERMAL_DISABLE = BIT(2),
		};

		enum power_supply_property {
		/* Properties of type `int' */
		POWER_SUPPLY_PROP_STATUS = 0,
		@@ -295,6 +301,7 @@ enum power_supply_property {
		POWER_SUPPLY_PROP_ESR_ACTUAL,
		POWER_SUPPLY_PROP_ESR_NOMINAL,
		POWER_SUPPLY_PROP_SOH,
		POWER_SUPPLY_PROP_QC_OPTI_DISABLE,
		/* Local extensions of type int64_t */
		POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,
		/* Properties of type `const char ' /