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

Commit de673f7a 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: Add device tree support for msm8953 boards"

parents a8fce87a eff347f9

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

+5 −0
Original line number Diff line number Diff line
@@ -172,6 +172,9 @@ Generic board variants: 
- HDK device:

  compatible = "qcom,hdk"



- IPC device:

  compatible = "qcom,ipc"



Boards (SoC type + board variant):



compatible = "qcom,apq8016"
@@ -201,6 +204,7 @@ compatible = "qcom,apq8017-cdp" 
compatible = "qcom,apq8017-mtp"

compatible = "qcom,apq8053-cdp"

compatible = "qcom,apq8053-mtp"

compatible = "qcom,apq8053-ipc"

compatible = "qcom,mdm9630-cdp"

compatible = "qcom,mdm9630-mtp"

compatible = "qcom,mdm9630-sim"
@@ -311,6 +315,7 @@ compatible = "qcom,msm8953-rumi" 
compatible = "qcom,msm8953-sim"

compatible = "qcom,msm8953-cdp"

compatible = "qcom,msm8953-mtp"

compatible = "qcom,msm8953-ipc"

compatible = "qcom,msm8953-qrd"

compatible = "qcom,msm8953-qrd-sku3"

compatible = "qcom,sdm450-mtp"

arch/arm64/boot/dts/qcom/Makefile

+23 −1
Original line number Diff line number Diff line
@@ -186,7 +186,29 @@ endif 


ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

else

dtb-$(CONFIG_ARCH_MSM8953) += msm8953-mtp.dtb

dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \

	msm8953-mtp.dtb \

	msm8953-ext-codec-mtp.dtb \

	msm8953-qrd-sku3.dtb \

	msm8953-rcm.dtb \

	apq8053-rcm.dtb \

	msm8953-ext-codec-rcm.dtb \

	apq8053-cdp.dtb \

	apq8053-ipc.dtb \

	msm8953-ipc.dtb \

	apq8053-mtp.dtb \

	apq8053-ext-audio-mtp.dtb \

	apq8053-ext-codec-rcm.dtb \

	msm8953-cdp-1200p.dtb \

	msm8953-iot-mtp.dtb \

	apq8053-iot-mtp.dtb \

	msm8953-pmi8940-cdp.dtb \

	msm8953-pmi8940-mtp.dtb \

	msm8953-pmi8937-cdp.dtb \

	msm8953-pmi8937-mtp.dtb \

	msm8953-pmi8940-ext-codec-mtp.dtb \

	msm8953-pmi8937-ext-codec-mtp.dtb



dtb-$(CONFIG_ARCH_SDM450) += sdm450-rcm.dtb \

	sdm450-cdp.dtb \

	sdm450-mtp.dtb \

arch/arm64/boot/dts/qcom/apq8053-cdp.dts

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "apq8053.dtsi"

#include "msm8953-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 CDP";

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

	qcom,board-id= <1 0>;

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

};

arch/arm64/boot/dts/qcom/apq8053-ext-audio-mtp.dts

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "apq8053.dtsi"

#include "msm8953-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 Ext Codec MTP";

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

	qcom,board-id= <8 1>;

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

};

arch/arm64/boot/dts/qcom/apq8053-ext-codec-rcm.dts

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;



#include "apq8053.dtsi"

#include "msm8953-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 Ext Codec RCM";

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

	qcom,board-id= <21 1>;

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

};