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

Commit 9bf765f6 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 qcom,msm-id format for APQ8084"

parents 123a3131 0c3d3b87

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

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
/ {

	model = "Qualcomm APQ 8084 CDP";

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

	qcom,msm-id = <178 1 0x10000>;

	qcom,board-id = <1 0>;

};

arch/arm/boot/dts/apq8084-sim.dts

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
/ {

	model = "Qualcomm APQ 8084 Simulator";

	compatible = "qcom,apq8084-sim", "qcom,apq8084", "qcom,sim";

	qcom,msm-id = <178 0 0>;

	qcom,board-id = <16 0>;



	aliases {

		serial0 = &uart0;

arch/arm/boot/dts/apq8084.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
/ {

	model = "Qualcomm APQ 8084";

	compatible = "qcom,apq8084";

	qcom,msm-id = <178 0x10000>;

	interrupt-parent = <&intc>;

	soc: soc { };

};