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

Commit 707fd824 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: msm8939: Rename 8936 device tree to 8939"

parents eeb0388d fb312126

arch/arm/boot/dts/qcom/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ dtb-$(CONFIG_ARCH_MSM8916) += msm8916-sim.dtb \ 
	msm8916-mtp-smb1360.dtb \

	msm8916-qrd-skuh.dtb \

	msm8916-qrd-skui.dtb \

	msm8936-sim.dtb \

	msm8936-rumi.dtb

	msm8939-sim.dtb \

	msm8939-rumi.dtb

dtb-$(CONFIG_ARCH_MSM8226) += msm8226-sim.dtb \

	msm8226-fluid.dtb \

	msm8226-v1-cdp.dtb \

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

+2 −2
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 


/dts-v1/;



#include "msm8936.dtsi"

#include "msm8939.dtsi"



/ {

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

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

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

	qcom,board-id= <15 0>;

};

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

+2 −2
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 


/dts-v1/;



#include "msm8936.dtsi"

#include "msm8939.dtsi"



/ {

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

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

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

	qcom,board-id= <16 0>;

};