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

Commit d76e0075 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: Update msm-id format for APQ8084 Interposer"

parents e1db7b53 3afa2e63

arch/arm/boot/dts/apq8084-interposer-cdp.dts

+2 −5
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 
/include/ "apq8084-cdp.dtsi"



/ {

	model = "Qualcomm MSM 8974Pro-AC APQ8084 Interporser CDP";

	model = "Qualcomm MSM 8974Pro-AC APQ8084 Interporser CDP / MTP";

	compatible = "qcom,msm8974-cdp", "qcom,msm8974", "qcom,cdp";

	qcom,msm-id = <194 1 0x10000>,

		      <210 1 0x10000>,

		      <213 1 0x10000>,

		      <216 1 0x10000>;

	qcom,board-id = <1 2>, <8 2>;

};

arch/arm/boot/dts/msm8974pro-ac.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ 
/include/ "msm-pma8084.dtsi"

/include/ "msm8974pro-ac-regulator.dtsi"



/ {

	qcom,msm-id = <194 0x10000>,

		      <210 0x10000>,

		      <213 0x10000>,

		      <216 0x10000>;

};



/*

 * Override PM8841 and PM8941 resources with proper PMA8084 resources for

 * MSM8974Pro AC.