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

Commit 4d8cfe50 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: Move the "qcom,flash-disable-soc" out of child node"

parents c1d26ff0 7d7830d1

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

+1 −1
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ 
			dpdm-supply = <&qusb_phy>;

			qcom,auto-recharge-soc = <98>;

			qcom,chg-vadc = <&pmi632_vadc>;

			qcom,flash-disable-soc = <10>;



			qcom,thermal-mitigation

				= <3000000 2500000 2000000 1500000
@@ -464,7 +465,6 @@ 
						"ilim1-s1",

						"ilim2-s2",

						"vreg-ok";

				qcom,flash-disable-soc = <10>;

			};



			smb5_vbus: qcom,smb5-vbus {