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

Commit e040bae2 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 overlay support for sdm439/sdm429"

parents a77eeef6 d8afec66

arch/arm64/boot/dts/qcom/Makefile

+23 −1
Original line number Diff line number Diff line
@@ -302,6 +302,14 @@ dtbo-$(CONFIG_ARCH_SDM632) += sdm632-rumi-overlay.dtbo \ 
	sdm450-mtp-s3-overlay.dtbo \

	sdm450-qrd-sku4-overlay.dtbo



dtbo-$(CONFIG_ARCH_SDM439) += sdm439-mtp-overlay.dtbo \

	sdm439-cdp-overlay.dtbo \

	sdm439-qrd-overlay.dtbo



dtbo-$(CONFIG_ARCH_SDM429) += sdm429-mtp-overlay.dtbo \

	sdm429-cdp-overlay.dtbo \

	sdm429-qrd-overlay.dtbo



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

	msm8953.dtb \

	apq8053.dtb \
@@ -340,6 +348,18 @@ sdm450-qrd-sku4-overlay.dtbo-base := sdm450-pmi632.dtb \ 
	sdm632.dtb

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



sdm439-mtp-overlay.dtbo-base := sdm439.dtb \

	msm8937-interposer-sdm439.dtb

sdm439-cdp-overlay.dtbo-base := sdm439.dtb \

	msm8937-interposer-sdm439.dtb

sdm439-qrd-overlay.dtbo-base := sdm439.dtb \

	msm8937-interposer-sdm439.dtb

sdm429-mtp-overlay.dtbo-base := sdm429.dtb \

	msm8937-interposer-sdm429.dtb

sdm429-cdp-overlay.dtbo-base := sdm429.dtb \

	msm8937-interposer-sdm429.dtb

sdm429-qrd-overlay.dtbo-base := sdm429.dtb \

	msm8937-interposer-sdm429.dtb

else

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

	msm8953-mtp.dtb \
@@ -370,7 +390,9 @@ dtb-$(CONFIG_ARCH_MSM8953) += msm8953-cdp.dtb \ 
dtb-$(CONFIG_ARCH_MSM8937) += msm8937-pmi8950-mtp.dtb \

	msm8937-interposer-sdm439-cdp.dtb \

	msm8937-interposer-sdm439-mtp.dtb \

	msm8937-interposer-sdm439-qrd.dtb

	msm8937-interposer-sdm439-qrd.dtb \

	msm8937-interposer-sdm429-cdp.dtb \

	msm8937-interposer-sdm429-mtp.dtb



dtb-$(CONFIG_ARCH_MSM8917) += msm8917-pmi8950-mtp.dtb

arch/arm64/boot/dts/qcom/msm8937-interposer-sdm429-cdp.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 "msm8937-interposer-sdm429.dtsi"

#include "sdm429-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8937 Interposer SDM429 CDP";

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

	qcom,board-id = <1 3>;

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

};

arch/arm64/boot/dts/qcom/msm8937-interposer-sdm429-mtp.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 "msm8937-interposer-sdm429.dtsi"

#include "sdm429-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8937 Interposer SDM429 MTP";

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

	qcom,board-id = <8 2>;

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

};

arch/arm64/boot/dts/qcom/msm8937-interposer-sdm429.dts

0 → 100644
+23 −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 "msm8937-interposer-sdm429.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/msm8937-interposer-sdm429.dtsi

0 → 100644
+58 −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.

 */



#include "msm8937-interposer-sdm439.dtsi"

#include "sdm429-cpu.dtsi"



&soc {

	/delete-node/ etm@619c000;

	/delete-node/ etm@619d000;

	/delete-node/ etm@619e000;

	/delete-node/ etm@619f000;

	/delete-node/ cti@61b8000;

	/delete-node/ cti@61b9000;

	/delete-node/ cti@61ba000;

	/delete-node/ cti@61bb000;



	qcom,spm@b1d2000 {

		qcom,cpu-vctl-list = <&CPU0 &CPU1 &CPU2 &CPU3>;

	};



	qcom,lpm-levels {

		qcom,pm-cluster@0 {

			/delete-node/qcom,pm-cluster@1;

		};

	};

};



&funnel_apss {

	ports {

		/delete-node/ port@1;

		/delete-node/ port@2;

		/delete-node/ port@3;

		/delete-node/ port@4;

	};

};



&thermal_zones {

	hexa-cpu-max-step {

		cooling-maps {

			/delete-node/ cpu4_cdev;

			/delete-node/ cpu5_cdev;

			/delete-node/ cpu6_cdev;

			/delete-node/ cpu7_cdev;

		};

	};



	/delete-node/ cpuss0-step;

};