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

Commit 95ab0ebb 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 pmi632 cdp s2"

parents e8f319ec f43e65c5

arch/arm64/boot/dts/qcom/Makefile

+19 −2
Original line number Diff line number Diff line
@@ -220,7 +220,15 @@ dtbo-$(CONFIG_ARCH_SDM450) += msm8953-mtp-overlay.dtbo \ 
	msm8953-cdp-overlay.dtbo \

	msm8953-rcm-overlay.dtbo \

	msm8953-qrd-overlay.dtbo \

	msm8953-iot-mtp-overlay.dtbo

	msm8953-iot-mtp-overlay.dtbo \

	sdm450-cdp-s2-overlay.dtbo \

	sdm450-mtp-s3-overlay.dtbo \

	sdm450-qrd-sku4-overlay.dtbo



dtbo-$(CONFIG_ARCH_SDM632) += sdm632-rumi-overlay.dtbo \

	sdm450-cdp-s2-overlay.dtbo \

	sdm450-mtp-s3-overlay.dtbo \

	sdm450-qrd-sku4-overlay.dtbo



msm8953-mtp-overlay.dtbo-base := sdm450.dtb \

	msm8953.dtb \
@@ -251,6 +259,14 @@ msm8953-ext-codec-mtp-overlay.dtbo-base := msm8953.dtb \ 
msm8953-ext-codec-rcm-overlay.dtbo-base := msm8953.dtb \

	apq8053.dtb

msm8953-cdp-1200p-overlay.dtbo-base := msm8953.dtb

sdm450-cdp-s2-overlay.dtbo-base := sdm450-pmi632.dtb \

	sdm632.dtb \

	msm8953-pmi632.dtb

sdm450-mtp-s3-overlay.dtbo-base := sdm450-pmi632.dtb \

	sdm632.dtb

sdm450-qrd-sku4-overlay.dtbo-base := sdm450-pmi632.dtb \

	sdm632.dtb

sdm632-rumi-overlay.dtbo-base := sdm632.dtb



else

dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \
@@ -274,7 +290,8 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \ 
	msm8953-pmi8937-cdp.dtb \

	msm8953-pmi8937-mtp.dtb \

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

	msm8953-pmi8937-ext-codec-mtp.dtb

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

	msm8953-pmi632-cdp-s2.dtb



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

	sdm450-cdp.dtb \

arch/arm64/boot/dts/qcom/msm8953-pmi632-cdp-s2.dts

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

 * Copyright (c) 2018, 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 "msm8953.dtsi"

#include "sdm450-pmi632-cdp-s2.dtsi"

#include "sdm450-pmi632.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. msm8953 + PMI632 CDP S2";

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

	qcom,board-id = <1 2>;

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

};

arch/arm64/boot/dts/qcom/msm8953-pmi632.dts

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

 * Copyright (c) 2018, 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 "msm8953.dtsi"

#include "sdm450-pmi632.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. msm8953 + PMI632 SOC";

	compatible = "qcom,msm8953";

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

	qcom,pmic-name = "PMI632";

};

arch/arm64/boot/dts/qcom/sdm450-cdp-s2-overlay.dts

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

 * Copyright (c) 2018, 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/;

/plugin/;



#include "sdm450-pmi632-cdp-s2.dtsi"



/ {

	model = "CDP S2";

	compatible = "qcom,cdp";

	qcom,board-id = <1 2>;

};

arch/arm64/boot/dts/qcom/sdm450-mtp-s3-overlay.dts

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

 * Copyright (c) 2018, 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/;

/plugin/;



#include "sdm450-pmi632-mtp-s3.dtsi"



/ {

	model = "MTP S3";

	compatible = "qcom,mtp";

	qcom,board-id = <8 3>;

};