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

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

Merge "ARM: dts: msm: enable parallel charging for 8992 MTP"

parents bee7d181 5ca8644e

arch/arm/boot/dts/qcom/msm8992-mtp.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -384,6 +384,14 @@ 
				>;

		interrupt-names = "silabs_fm_int", "silabs_fm_status_int";

	};



	smb1357-charger@1c {

		compatible = "qcom,smb1357-charger";

		reg = <0x1c>;

		qcom,parallel-charger;

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

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

	};

};



&soc {

arch/arm/boot/dts/qcom/msm8992.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ 
		interrupt-names = "cdc-int";

	};



	i2c_5: i2c_11: i2c@f9967000 { /* BLSP2 QUP5 */

	i2c_5: i2c@f9967000 { /* BLSP2 QUP5 */

		compatible = "qcom,i2c-msm-v2";

		#address-cells = <1>;

		#size-cells = <0>;