From d93f0d5371cf321f7dd35979039f72be936e2c14 Mon Sep 17 00:00:00 2001 From: Bruce Levy Date: Wed, 13 Mar 2024 12:15:15 -0700 Subject: [PATCH] Revert "ARM: dts: msm: Add MTP with QMP1000 support on Sun SoC" This reverts commit a73ccadad290e7deda04741f548284c62a021ef5. Reason for revert: With this change, we are unable to boot v6 devices. Change-Id: I57d2ba2dd693a6c8625ffe46bb170e17b6d6cb84 Signed-off-by: Bruce Levy --- qcom/Makefile | 2 -- qcom/platform_map.bzl | 2 -- qcom/sun-mtp-qmp1000-overlay.dts | 17 ----------------- qcom/sun-mtp-qmp1000-v8-overlay.dts | 17 ----------------- qcom/sun-mtp-qmp1000-v8.dtsi | 14 -------------- qcom/sun-mtp-qmp1000.dtsi | 6 ------ 6 files changed, 58 deletions(-) delete mode 100644 qcom/sun-mtp-qmp1000-overlay.dts delete mode 100644 qcom/sun-mtp-qmp1000-v8-overlay.dts delete mode 100644 qcom/sun-mtp-qmp1000-v8.dtsi delete mode 100644 qcom/sun-mtp-qmp1000.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 8429f688..4cf30e01 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -24,8 +24,6 @@ SUN_BOARDS += \ sun-mtp-kiwi-v8-overlay.dtbo \ sun-mtp-nfc-overlay.dtbo \ sun-mtp-overlay.dtbo \ - sun-mtp-qmp1000-overlay.dtbo \ - sun-mtp-qmp1000-v8-overlay.dtbo \ sun-mtp-v8-overlay.dtbo \ sun-cdp-kiwi-overlay.dtbo \ sun-cdp-kiwi-v8-overlay.dtbo \ diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index 66cd194e..e86fd2c2 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -27,8 +27,6 @@ _platform_map = { {"name": "sun-mtp-kiwi-v8-overlay.dtbo"}, {"name": "sun-mtp-nfc-overlay.dtbo"}, {"name": "sun-mtp-overlay.dtbo"}, - {"name": "sun-mtp-qmp1000-overlay.dtbo"}, - {"name": "sun-mtp-qmp1000-v8-overlay.dtbo"}, {"name": "sun-mtp-v8-overlay.dtbo"}, {"name": "sun-qrd-sku1-overlay.dtbo"}, {"name": "sun-qrd-sku1-v8-overlay.dtbo"}, diff --git a/qcom/sun-mtp-qmp1000-overlay.dts b/qcom/sun-mtp-qmp1000-overlay.dts deleted file mode 100644 index ab427dcb..00000000 --- a/qcom/sun-mtp-qmp1000-overlay.dts +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "sun-mtp-qmp1000.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Sun MTP QMP1000"; - compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", - "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x10108 0>; -}; diff --git a/qcom/sun-mtp-qmp1000-v8-overlay.dts b/qcom/sun-mtp-qmp1000-v8-overlay.dts deleted file mode 100644 index 200896b0..00000000 --- a/qcom/sun-mtp-qmp1000-v8-overlay.dts +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; -/plugin/; - -#include "sun-mtp-qmp1000-v8.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Sun MTP QMP1000 V8 Power Grid"; - compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", - "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x40108 0>; -}; diff --git a/qcom/sun-mtp-qmp1000-v8.dtsi b/qcom/sun-mtp-qmp1000-v8.dtsi deleted file mode 100644 index 94748b0f..00000000 --- a/qcom/sun-mtp-qmp1000-v8.dtsi +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -#include "sun-mtp-qmp1000.dtsi" -#include "sun-pmic-overlay-v8.dtsi" - -®ulator_ocp_notifier { - /delete-property/ periph-9a4-supply; /* S4J */ - periph-5a7-supply = <&S5F>; - /delete-property/ periph-5aa-supply; /* S6F */ - periph-5b0-supply = <&S8F_LEVEL>; -}; diff --git a/qcom/sun-mtp-qmp1000.dtsi b/qcom/sun-mtp-qmp1000.dtsi deleted file mode 100644 index 5a7bc812..00000000 --- a/qcom/sun-mtp-qmp1000.dtsi +++ /dev/null @@ -1,6 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -#include "sun-mtp.dtsi"