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

Commit cdb65593 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: Add power supply property to force recharge"

parents 9b17f329 ac0aff3c

arch/arm64/boot/dts/qcom/pm6150.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -408,6 +408,8 @@ 
			qcom,qg-iterm-ma = <100>;

			qcom,hold-soc-while-full;

			qcom,linearize-soc;

			qcom,cl-feedback-on;



			qcom,pmic-revid = <&pm6150_revid>;

			io-channels = <&pm6150_vadc ADC_BAT_THERM_PU2>,

				      <&pm6150_vadc ADC_BAT_ID_PU2>;
@@ -430,9 +432,9 @@ 
						  "qg-good-ocv";

			};



			qcom,qg-sdam@b500 {

			qcom,qg-sdam@b600 {

				status = "okay";

				reg = <0xb500 0x100>;

				reg = <0xb600 0x100>;

			};

		};

drivers/power/supply/power_supply_sysfs.c

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,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(force_recharge),

	/* Local extensions of type int64_t */

	POWER_SUPPLY_ATTR(charge_counter_ext),

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

include/linux/power_supply.h

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

	POWER_SUPPLY_PROP_ESR_NOMINAL,

	POWER_SUPPLY_PROP_SOH,

	POWER_SUPPLY_PROP_FORCE_RECHARGE,

	/* Local extensions of type int64_t */

	POWER_SUPPLY_PROP_CHARGE_COUNTER_EXT,

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