From 9d38919c06df659fb8ce9518a62bd31a8f251f58 Mon Sep 17 00:00:00 2001 From: Bruce Levy Date: Mon, 8 Jul 2024 18:39:59 -0700 Subject: [PATCH] Revert "ARM: dts: msm: Add support for new parrot board id" This reverts commit 37bec57729fbda553ff86681e96fbc31241d6872. Signed-off-by: Bruce Levy Change-Id: Ia00ca3b966e837abc9fca5a41daa4a950ba0228b --- qcom/Makefile | 7 +------ .../parrot-idp-wcn6755-amoled-rcm-overlay.dts | 19 ------------------ qcom/parrot-idp-wcn6755-nopmi-overlay.dts | 20 ------------------- qcom/parrot-idp-wcn6755-overlay.dts | 19 ------------------ qcom/parrot-idp-wcn6755-pm8350b-overlay.dts | 19 ------------------ qcom/parrot-qrd-wcn6755-overlay.dts | 19 ------------------ qcom/platform_map.bzl | 5 ----- 7 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 qcom/parrot-idp-wcn6755-amoled-rcm-overlay.dts delete mode 100644 qcom/parrot-idp-wcn6755-nopmi-overlay.dts delete mode 100644 qcom/parrot-idp-wcn6755-overlay.dts delete mode 100644 qcom/parrot-idp-wcn6755-pm8350b-overlay.dts delete mode 100644 qcom/parrot-qrd-wcn6755-overlay.dts diff --git a/qcom/Makefile b/qcom/Makefile index 50bec119..ebe62f22 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -107,12 +107,7 @@ PARROT_BOARDS += \ parrot-qrd-overlay.dtbo \ parrot-qrd-wcn6750-overlay.dtbo \ parrot-qrd-nopmi-overlay.dtbo \ - parrot-qrd-pm8350b-overlay.dtbo \ - parrot-idp-wcn6755-overlay.dtbo \ - parrot-idp-wcn6755-amoled-rcm-overlay.dtbo \ - parrot-qrd-wcn6755-overlay.dtbo \ - parrot-idp-wcn6755-pm8350b-overlay.dtbo \ - parrot-idp-wcn6755-nopmi-overlay.dtbo + parrot-qrd-pm8350b-overlay.dtbo PARROT_4GB_BOARDS += \ parrot-idp-4gb-overlay.dtbo \ diff --git a/qcom/parrot-idp-wcn6755-amoled-rcm-overlay.dts b/qcom/parrot-idp-wcn6755-amoled-rcm-overlay.dts deleted file mode 100644 index 78d88fc5..00000000 --- a/qcom/parrot-idp-wcn6755-amoled-rcm-overlay.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "parrot-idp-wcn6750-amoled-rcm.dtsi" -#include "parrot-idp-pm7250b.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP + AMOLED + RCM"; - compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>, - <663 0x10000>; - qcom,board-id = <34 6>; -}; diff --git a/qcom/parrot-idp-wcn6755-nopmi-overlay.dts b/qcom/parrot-idp-wcn6755-nopmi-overlay.dts deleted file mode 100644 index 057ceb2e..00000000 --- a/qcom/parrot-idp-wcn6755-nopmi-overlay.dts +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "parrot-idp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Parrot IDP + WCN6755"; - compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>, - <663 0x10000>; - qcom,board-id = <34 5>; - qcom,pmic-id-size = <9>; - qcom,pmic-id = <0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0>; -}; diff --git a/qcom/parrot-idp-wcn6755-overlay.dts b/qcom/parrot-idp-wcn6755-overlay.dts deleted file mode 100644 index b3482aa8..00000000 --- a/qcom/parrot-idp-wcn6755-overlay.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "parrot-idp.dtsi" -#include "parrot-idp-pm7250b.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP"; - compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>, - <663 0x10000>; - qcom,board-id = <34 5>; -}; diff --git a/qcom/parrot-idp-wcn6755-pm8350b-overlay.dts b/qcom/parrot-idp-wcn6755-pm8350b-overlay.dts deleted file mode 100644 index ed0389eb..00000000 --- a/qcom/parrot-idp-wcn6755-pm8350b-overlay.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "parrot-idp.dtsi" -#include "parrot-idp-pm8350b.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Parrot IDP + WCN6755"; - compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>, - <663 0x10000>; - qcom,board-id = <34 5>; -}; diff --git a/qcom/parrot-qrd-wcn6755-overlay.dts b/qcom/parrot-qrd-wcn6755-overlay.dts deleted file mode 100644 index fba1b173..00000000 --- a/qcom/parrot-qrd-wcn6755-overlay.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "parrot-qrd-wcn6750.dtsi" -#include "parrot-qrd-pm7250b.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Parrot WCN6755 QRD"; - compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, - <633 0x10000>, <634 0x10000>, <638 0x10000>, - <663 0x10000>; - qcom,board-id = <0x1000B 2>; -}; diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index deb66a79..f70d7b36 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -218,11 +218,6 @@ _platform_map = { {"name": "parrot-idp-wcn6750-amoled-4gb-overlay.dtbo"}, {"name": "parrot-qrd-4gb-overlay.dtbo"}, {"name": "parrot-qrd-wcn6750-4gb-overlay.dtbo"}, - {"name": "parrot-idp-wcn6755-amoled-rcm-overlay.dtbo"}, - {"name": "parrot-idp-wcn6755-overlay.dtbo"}, - {"name": "parrot-qrd-wcn6755-overlay.dtbo"}, - {"name": "parrot-idp-wcn6755-pm8350b-overlay.dtbo"}, - {"name": "parrot-idp-wcn6755-nopmi-overlay.dtbo"}, {"name": "ravelin-rumi-overlay.dtbo"}, {"name": "ravelin-atp-overlay.dtbo"}, {"name": "ravelin-idp-overlay.dtbo"},