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

Commit 169c3c33 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Remove CDP and MTP device tree files on sm6150"

parents 260265f8 9b11918f

arch/arm64/boot/dts/qcom/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -83,21 +83,15 @@ endif 


ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SM6150) += \

		sm6150-cdp-overlay.dtbo \

		sm6150-mtp-overlay.dtbo \

		sm6150-rumi-overlay.dtbo \

		sm6150-qrd-overlay.dtbo \

		sm6150-idp-overlay.dtbo \



sm6150-cdp-overlay.dtbo-base := sm6150.dtb

sm6150-mtp-overlay.dtbo-base := sm6150.dtb

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

sm6150-qrd-overlay.dtbo-base := sm6150.dtb

sm6150-idp-overlay.dtbo-base := sm6150.dtb

else

dtb-$(CONFIG_ARCH_SM6150)	+= sm6150-rumi.dtb \

	sm6150-mtp.dtb \

	sm6150-cdp.dtb \

	sm6150-qrd.dtb \

	sm6150-idp.dtb

endif

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

deleted100644 → 0
+0 −25
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/interrupt-controller/arm-gic.h>



#include "sm6150-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150 CDP";

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

	qcom,msm-id = <355 0x0>;

	qcom,board-id = <1 0>;

};

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

deleted100644 → 0
+0 −22
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 "sm6150.dtsi"

#include "sm6150-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150 CDP";

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

	qcom,board-id = <1 0>;

};

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

deleted100644 → 0
+0 −25
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/interrupt-controller/arm-gic.h>



#include "sm6150-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150 MTP";

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

	qcom,msm-id = <355 0x0>;

	qcom,board-id = <8 0>;

};

arch/arm64/boot/dts/qcom/sm6150-mtp.dts

deleted100644 → 0
+0 −22
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 "sm6150.dtsi"

#include "sm6150-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150 MTP";

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

	qcom,board-id = <8 0>;

};