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

Commit 04664784 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: Add property to choose right reset sequence for msm8940"

parents c39fdd2a 3da51b7b

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

+1 −1
Original line number Diff line number Diff line
@@ -1737,7 +1737,7 @@ 
		vdd-supply = <&gdsc_mdss>;

	};



	qcom,mss@4080000 {

	pil_mss: qcom,mss@4080000 {

		compatible = "qcom,pil-q6v55-mss";

		reg = <0x04080000 0x100>,

		      <0x0194f000 0x010>,

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

+4 −0
Original line number Diff line number Diff line
@@ -303,6 +303,10 @@ 
	coresight-child-ports = <2>;

	qcom,inst-id = <11>;

};

&pil_mss {

	/delete-property/ qcom,qdsp6v56-1-8-inrush-current;

	qcom,qdsp6v56-1-8;

};



&soc {

	cti_modem_cpu1: cti@6128000{