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

Commit d55e3c18 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 samarium"

parents dfddfc42 3a0e6997

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

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 




/ {

        model = "Qualcomm MSM 8974Pro-ac SAMARIUM Interposer CDP";

        model = "Qualcomm MSM 8974Pro-ac SAMARIUM Interposer CDP / MTP";

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

        qcom,msm-id = <195 1 8>;

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

};



&pma8084_l3 {

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

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

	model = "Qualcomm MSM SAMARIUM CDP";

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

	qcom,msm-id = <195 1 0>;

	qcom,board-id = <1 0>;

};

arch/arm/boot/dts/msmsamarium-rumi.dts

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

	model = "Qualcomm MSM SAMARIUM RUMI";

	compatible = "qcom,msmsamarium-rumi", "qcom,msmsamarium", "qcom,rumi";

	qcom,msm-id = <195 15 0>;

	qcom,board-id = <15 0>;

};



&blsp1_uart2{

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

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

	model = "Qualcomm MSM SAMARIUM SIM";

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

	qcom,msm-id = <195 16 0>;

	qcom,board-id = <16 0>;

};



&blsp1_uart2{

arch/arm/boot/dts/msmsamarium.dtsi

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

	model = "Qualcomm MSM SAMARIUM";

	compatible = "qcom,msmsamarium";

	qcom,msm-id = <195 0>;

	interrupt-parent = <&intc>;

	soc: soc { };

	aliases {