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

Commit 9b9543e9 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 apq8053 and apq8017"

parents 0e211e4f de0f52d6

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

+8 −8
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ SoCs: 
- APQ8937

  compatible = "qcom,apq8037"



- APQ8917

  compatible = "qcom,apq8917"

- APQ8017

  compatible = "qcom,apq8017"



- APQ8953

  compatible = "qcom,apq8953"

- APQ8053

  compatible = "qcom,apq8053"



- MDM9630

  compatible = "qcom,mdm9630"
@@ -175,10 +175,10 @@ compatible = "qcom,apq8096-sbc" 
compatible = "qcom,apq8096-liquid"

compatible = "qcom,apq8037-cdp"

compatible = "qcom,apq8037-mtp"

compatible = "qcom,apq8917-cdp"

compatible = "qcom,apq8917-mtp"

compatible = "qcom,apq8953-cdp"

compatible = "qcom,apq8953-mtp"

compatible = "qcom,apq8017-cdp"

compatible = "qcom,apq8017-mtp"

compatible = "qcom,apq8053-cdp"

compatible = "qcom,apq8053-mtp"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"

arch/arm/boot/dts/qcom/Makefile

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



dtb-$(CONFIG_ARCH_MSM8917) += msm8917-rumi.dtb \

	apq8917-pmi8937-cdp.dtb \

	apq8917-pmi8937-mtp.dtb \

	apq8917-pmi8950-cdp.dtb \

	apq8917-pmi8950-mtp.dtb \

	apq8017-pmi8937-cdp.dtb \

	apq8017-pmi8937-mtp.dtb \

	apq8017-pmi8950-cdp.dtb \

	apq8017-pmi8950-mtp.dtb \

	msm8917-pmi8937-cdp.dtb \

	msm8917-pmi8937-mtp.dtb \

	msm8917-pmi8950-cdp.dtb \
@@ -151,8 +151,8 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-sim.dtb \ 
	msm8953-qrd-sku3.dtb \

	msm8953-rcm.dtb \

	msm8953-ext-codec-rcm.dtb \

	apq8953-cdp.dtb \

	apq8953-mtp.dtb \

	apq8053-cdp.dtb \

	apq8053-mtp.dtb \

	msm8953-cdp-1200p.dtb



dtb-$(CONFIG_ARCH_MDM9607) += mdm9607-rumi.dtb \

arch/arm/boot/dts/qcom/apq8917-pmi8937-cdp.dts→arch/arm/boot/dts/qcom/apq8017-pmi8937-cdp.dts

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


/dts-v1/;



#include "apq8917.dtsi"

#include "apq8017.dtsi"

#include "msm8917-pmi8937-cdp.dtsi"



/ {

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

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

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

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

	qcom,board-id= <1 0>;

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

};

arch/arm/boot/dts/qcom/apq8917-pmi8937-mtp.dts→arch/arm/boot/dts/qcom/apq8017-pmi8937-mtp.dts

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


/dts-v1/;



#include "apq8917.dtsi"

#include "apq8017.dtsi"

#include "msm8917-pmi8937-mtp.dtsi"



/ {

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

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

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

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

	qcom,board-id= <8 0>;

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

};

arch/arm/boot/dts/qcom/apq8917-pmi8950-cdp.dts→arch/arm/boot/dts/qcom/apq8017-pmi8950-cdp.dts

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


/dts-v1/;



#include "apq8917.dtsi"

#include "apq8017.dtsi"

#include "msm8917-pmi8950-cdp.dtsi"



/ {

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

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

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

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

	qcom,board-id= <1 0>;

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

};