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

Commit 085d672a authored by Raghavendra Rao Ananta's avatar Raghavendra Rao Ananta
Browse files

ARM: dts: msm: Remove redundant sm8150p board overlay files 



The sm8150p-[mtp|cdp|qrd]-overlay.dts files are redundant by the
fact that MSM and APQ SoCs can be overlayed onto the same board
(MTP, CDP or QRD). There's no need to explicitly add board files
specific to each SoC. It's the responsibilty of the bootloader
to pick the correct SoC and the board file required to be
overlayed on top of it. Hence, remove the redundant files from
the source.

Change-Id: I47d1269434b8ad0d064d0943f20410efb02172a3
Signed-off-by: default avatarRaghavendra Rao Ananta <rananta@codeaurora.org>
parent b49908b7

arch/arm64/boot/dts/qcom/Makefile

+9 −14
Original line number Diff line number Diff line
@@ -28,27 +28,22 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm8150-qrd-dvt-overlay.dtbo \

		sa8155-adp-star-overlay.dtbo \

                sa8155p-adp-star-overlay.dtbo \

		sm8150p-cdp-overlay.dtbo \

		sm8150p-mtp-overlay.dtbo \

		sm8150p-qrd-overlay.dtbo \

		sm8150-sdx50m-cdp-overlay.dtbo \

		sm8150-sdx50m-mtp-overlay.dtbo \

		sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo \

		sm8150-sdx50m-qrd-overlay.dtbo



sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-rumi-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-qrd-dvt-overlay.dtbo-base := sm8150-v2.dtb

sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-rumi-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-qrd-dvt-overlay.dtbo-base := sm8150-v2.dtb sm8150p-v2.dtb

sa8155-adp-star-overlay.dtbo-base := sa8155.dtb

sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb

sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150-sdx50m-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb

sm8150p-mtp-overlay.dtbo-base := sm8150p.dtb sm8150p-v2.dtb

sm8150p-qrd-overlay.dtbo-base := sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

else

dtb-$(CONFIG_ARCH_SM8150)	+= sm8150-rumi.dtb \

	sm8150-mtp.dtb \

arch/arm64/boot/dts/qcom/sm8150p-cdp-overlay.dts

deleted100644 → 0
+0 −28
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 <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,camcc-sm8150.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm8150-cdp.dtsi"

#include "sm8150-cdp-audio-overlay.dtsi"



/ {

	model = "CDP";

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

	qcom,board-id = <1 0>;

};

arch/arm64/boot/dts/qcom/sm8150p-mtp-overlay.dts

deleted100644 → 0
+0 −28
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 <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,camcc-sm8150.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm8150-mtp.dtsi"

#include "sm8150-mtp-audio-overlay.dtsi"



/ {

	model = "MTP";

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

	qcom,board-id = <8 0>;

};

arch/arm64/boot/dts/qcom/sm8150p-qrd-overlay.dts

deleted100644 → 0
+0 −28
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 <dt-bindings/clock/qcom,gcc-sm8150.h>

#include <dt-bindings/clock/qcom,camcc-sm8150.h>

#include <dt-bindings/clock/qcom,rpmh.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm8150-qrd.dtsi"

#include "sm8150-qrd-audio-overlay.dtsi"



/ {

	model = "QRD";

	compatible = "qcom,sm8150p-qrd", "qcom,sm8150p", "qcom,qrd";

	qcom,board-id = <11 0>;

};