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

Commit 42c1d432 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 couple of dts files to apq8037"

parents 88be89ea 67a3f84b

Documentation/devicetree/bindings/arm/msm/msm.txt

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ SoCs: 
  compatible = "qcom,apq8096"



- APQ8937

  compatible = "qcom,apq8937"

  compatible = "qcom,apq8037"



- MDM9630

  compatible = "qcom,mdm9630"
@@ -154,8 +154,8 @@ compatible = "qcom,apq8096-cdp" 
compatible = "qcom,apq8096-mtp"

compatible = "qcom,apq8096-dragonboard"

compatible = "qcom,apq8096-liquid"

compatible = "qcom,apq8937-cdp"

compatible = "qcom,apq8937-mtp"

compatible = "qcom,apq8037-cdp"

compatible = "qcom,apq8037-mtp"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"

arch/arm/boot/dts/qcom/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -94,10 +94,10 @@ dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \ 
	msm8937-pmi8937-mtp.dtb \

	msm8937-pmi8950-rcm.dtb \

	msm8937-pmi8937-rcm.dtb \

	apq8937-pmi8950-cdp.dtb \

	apq8937-pmi8937-cdp.dtb \

	apq8937-pmi8950-mtp.dtb \

	apq8937-pmi8937-mtp.dtb

	apq8037-pmi8950-cdp.dtb \

	apq8037-pmi8937-cdp.dtb \

	apq8037-pmi8950-mtp.dtb \

	apq8037-pmi8937-mtp.dtb



dtb-$(CONFIG_ARCH_MSMTITANIUM) += msmtitanium-sim.dtb \

	msmtitanium-rumi.dtb

arch/arm/boot/dts/qcom/apq8937-pmi8937-cdp.dts→arch/arm/boot/dts/qcom/apq8037-pmi8937-cdp.dts

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


/dts-v1/;



#include "apq8937.dtsi"

#include "apq8037.dtsi"

#include "msm8937-pmi8937-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8937-PMI8937 CDP";

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

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

	qcom,board-id= <1 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};

arch/arm/boot/dts/qcom/apq8937-pmi8937-mtp.dts→arch/arm/boot/dts/qcom/apq8037-pmi8937-mtp.dts

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


/dts-v1/;



#include "apq8937.dtsi"

#include "apq8037.dtsi"

#include "msm8937-pmi8937-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8937-PMI8937 MTP";

	compatible = "qcom,apq8937-mtp", "qcom,apq8937", "qcom,mtp";

	compatible = "qcom,apq8037-mtp", "qcom,apq8037", "qcom,mtp";

	qcom,board-id= <8 0>;

	qcom,pmic-id = <0x10019 0x020037 0x0 0x0>;

};

arch/arm/boot/dts/qcom/apq8937-pmi8950-cdp.dts→arch/arm/boot/dts/qcom/apq8037-pmi8950-cdp.dts

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


/dts-v1/;



#include "apq8937.dtsi"

#include "apq8037.dtsi"

#include "msm8937-pmi8950-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8937-PMI8950 CDP";

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

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

	qcom,board-id= <1 0>;

	qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

};