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

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

Merge "ARM: msm: dts: Fix the DT node for recharge threshold on SMB135x"

parents 3be9dea1 b11b172b

arch/arm/boot/dts/msmsamarium-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ 
		interrupts = <0x0 0xcc 0x0>;	/* PMA8084 GPIO 13 */

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mV = <100>;

		qcom,recharge-thresh-mv = <200>;

		regulator-name = "smb1359_otg_supply";

	};

};

arch/arm/boot/dts/msmsamarium-mtp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ 
		interrupts = <0x0 0xcc 0x0>;	/* PMA8084 GPIO 13 */

		qcom,float-voltage-mv = <4200>;

		qcom,charging-timeout = <1536>;

		qcom,recharge-thresh-mV = <100>;

		qcom,recharge-thresh-mv = <200>;

		regulator-name = "smb1359_otg_supply";

	};

};