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

Commit 1be8fe1d 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: change name from 8936 to 8939"

parents 4f93094c 517f74d4

arch/arm/boot/dts/qcom/msm8939-rumi.dts

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


/ {

	model = "Qualcomm Technologies, Inc. MSM8939 RUMI";

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

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

	qcom,board-id= <15 0>;

};

arch/arm/boot/dts/qcom/msm8939-sim.dts

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


/ {

	model = "Qualcomm Technologies, Inc. MSM8939 Simulator";

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

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

	qcom,board-id= <16 0>;

};

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

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <dt-bindings/clock/msm-clocks-8916.h>



/ {

	model = "Qualcomm Technologies, Inc. MSM8936";

	compatible = "qcom,msm8936";

	model = "Qualcomm Technologies, Inc. MSM8939";

	compatible = "qcom,msm8939";

	qcom,msm-id = <239 0>, <241 0>;

	interrupt-parent = <&intc>;

	aliases {