From 6b9a418d99380310c0b14b8686008feb83a84f3e Mon Sep 17 00:00:00 2001 From: Linux Image Build Automation Date: Tue, 14 May 2024 02:29:33 -0700 Subject: [PATCH] Revert "ARM: dts: qcom: Add package ID to msm-IDs for sun SoC" This reverts commit ebccd23325f62280a744839723d2509815d5c043. Change-Id: I211cf2c073d8fc86656b0b27a6f50d8b1ef054be Signed-off-by: Linux Image Build Automation --- qcom/Makefile | 4 ++-- qcom/platform_map.bzl | 10 ---------- qcom/sun-atp-overlay.dts | 5 ++--- qcom/sun-cdp-kiwi-overlay.dts | 6 ++---- qcom/sun-cdp-kiwi-v8-overlay.dts | 6 ++---- qcom/sun-cdp-nfc-overlay.dts | 6 ++---- qcom/sun-cdp-no-display-overlay.dts | 4 +--- qcom/sun-cdp-overlay.dts | 6 ++---- qcom/sun-cdp-v8-overlay.dts | 6 ++---- qcom/sun-mtp-3.5mm-overlay.dts | 4 +--- qcom/sun-mtp-kiwi-overlay.dts | 6 ++---- qcom/sun-mtp-kiwi-v8-overlay.dts | 6 ++---- qcom/sun-mtp-nfc-overlay.dts | 6 ++---- qcom/sun-mtp-overlay.dts | 6 ++---- qcom/sun-mtp-qmp1000-overlay.dts | 4 +--- qcom/sun-mtp-qmp1000-v8-overlay.dts | 4 +--- qcom/sun-mtp-v8-overlay.dts | 6 ++---- qcom/sun-qrd-sku1-overlay.dts | 6 ++---- qcom/sun-qrd-sku1-v8-overlay.dts | 6 ++---- qcom/sun-qrd-sku2-v8-overlay.dts | 6 ++---- qcom/sun-rcm-kiwi-overlay.dts | 3 +-- qcom/sun-rcm-kiwi-v8-overlay.dts | 3 +-- qcom/sun-rcm-overlay.dts | 5 ++--- qcom/sun-rcm-v8-overlay.dts | 3 +-- qcom/sun-tp-v2.dts | 15 --------------- qcom/sun-tp-v2.dtsi | 12 ------------ qcom/sun-tp.dts | 15 --------------- qcom/sun-tp.dtsi | 10 ---------- qcom/sunp-tp-v2.dts | 15 --------------- qcom/sunp-tp-v2.dtsi | 12 ------------ qcom/sunp-tp.dts | 15 --------------- qcom/sunp-tp.dtsi | 12 ------------ 32 files changed, 39 insertions(+), 194 deletions(-) delete mode 100644 qcom/sun-tp-v2.dts delete mode 100644 qcom/sun-tp-v2.dtsi delete mode 100644 qcom/sun-tp.dts delete mode 100644 qcom/sun-tp.dtsi delete mode 100644 qcom/sunp-tp-v2.dts delete mode 100644 qcom/sunp-tp-v2.dtsi delete mode 100644 qcom/sunp-tp.dts delete mode 100644 qcom/sunp-tp.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 855c32bf..b6f67d4e 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -15,8 +15,8 @@ add-overlays = $(foreach o,$1,$(foreach b,$2,$(eval $(basename $b)-$(basename $o ifneq ($(CONFIG_ARCH_QTI_VM), y) -SUN_BASE_DTB += sun.dtb sun-v2.dtb sun-tp.dtb sun-tp-v2.dtb -SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb sunp-tp.dtb sunp-tp-v2.dtb +SUN_BASE_DTB += sun.dtb sun-v2.dtb +SUN_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb SUN_BOARDS += \ sun-mtp-3.5mm-overlay.dtbo \ diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index bb9d0719..eea59c6e 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -12,16 +12,6 @@ _platform_map = { "apq": True, }, {"name": "sun-v2.dtb"}, - {"name": "sun-tp.dtb"}, - {"name": "sun-tp-v2.dtb"}, - { - "name": "sunp-tp.dtb", - "apq": True, - }, - { - "name": "sunp-tp-v2.dtb", - "apq": True, - }, ], "dtbo_list": [ # keep sorted diff --git a/qcom/sun-atp-overlay.dts b/qcom/sun-atp-overlay.dts index e97fb466..c582c4e1 100644 --- a/qcom/sun-atp-overlay.dts +++ b/qcom/sun-atp-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,7 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun ATP"; compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp", "qcom,atp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, - <0x100026a 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x10021 0>; }; diff --git a/qcom/sun-cdp-kiwi-overlay.dts b/qcom/sun-cdp-kiwi-overlay.dts index 433c2812..d4e41ba8 100644 --- a/qcom/sun-cdp-kiwi-overlay.dts +++ b/qcom/sun-cdp-kiwi-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x20001 0>; }; diff --git a/qcom/sun-cdp-kiwi-v8-overlay.dts b/qcom/sun-cdp-kiwi-v8-overlay.dts index 0e77c536..f9dd0262 100644 --- a/qcom/sun-cdp-kiwi-v8-overlay.dts +++ b/qcom/sun-cdp-kiwi-v8-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP Kiwi WLAN V8 Power Grid"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x60001 0>; }; diff --git a/qcom/sun-cdp-nfc-overlay.dts b/qcom/sun-cdp-nfc-overlay.dts index d0031b40..d5929915 100644 --- a/qcom/sun-cdp-nfc-overlay.dts +++ b/qcom/sun-cdp-nfc-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -11,8 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP SN300 NFC"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x40001 0>; }; diff --git a/qcom/sun-cdp-no-display-overlay.dts b/qcom/sun-cdp-no-display-overlay.dts index 4bda478f..cf7161e6 100644 --- a/qcom/sun-cdp-no-display-overlay.dts +++ b/qcom/sun-cdp-no-display-overlay.dts @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP No Display"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x30001 0>; }; diff --git a/qcom/sun-cdp-overlay.dts b/qcom/sun-cdp-overlay.dts index 4ba26c03..0c09832a 100644 --- a/qcom/sun-cdp-overlay.dts +++ b/qcom/sun-cdp-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <1 0>; }; diff --git a/qcom/sun-cdp-v8-overlay.dts b/qcom/sun-cdp-v8-overlay.dts index 02f6685d..68c3aa4f 100644 --- a/qcom/sun-cdp-v8-overlay.dts +++ b/qcom/sun-cdp-v8-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun CDP V8 Power Grid"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>; }; diff --git a/qcom/sun-mtp-3.5mm-overlay.dts b/qcom/sun-mtp-3.5mm-overlay.dts index 580bf88f..8bf006f8 100644 --- a/qcom/sun-mtp-3.5mm-overlay.dts +++ b/qcom/sun-mtp-3.5mm-overlay.dts @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP with 3.5mm"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x60008 0>; }; diff --git a/qcom/sun-mtp-kiwi-overlay.dts b/qcom/sun-mtp-kiwi-overlay.dts index d5444429..ce7816c1 100644 --- a/qcom/sun-mtp-kiwi-overlay.dts +++ b/qcom/sun-mtp-kiwi-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x20008 0>; }; diff --git a/qcom/sun-mtp-kiwi-v8-overlay.dts b/qcom/sun-mtp-kiwi-v8-overlay.dts index dfaf396c..cd0d10f3 100644 --- a/qcom/sun-mtp-kiwi-v8-overlay.dts +++ b/qcom/sun-mtp-kiwi-v8-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN 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>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50008 0>; }; diff --git a/qcom/sun-mtp-nfc-overlay.dts b/qcom/sun-mtp-nfc-overlay.dts index 49f86246..6aa03e84 100644 --- a/qcom/sun-mtp-nfc-overlay.dts +++ b/qcom/sun-mtp-nfc-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -11,8 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP SN300 NFC"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x30008 0>; }; diff --git a/qcom/sun-mtp-overlay.dts b/qcom/sun-mtp-overlay.dts index 8da7d8eb..983d05f7 100644 --- a/qcom/sun-mtp-overlay.dts +++ b/qcom/sun-mtp-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <8 0>; }; diff --git a/qcom/sun-mtp-qmp1000-overlay.dts b/qcom/sun-mtp-qmp1000-overlay.dts index 45754198..345c4e6d 100644 --- a/qcom/sun-mtp-qmp1000-overlay.dts +++ b/qcom/sun-mtp-qmp1000-overlay.dts @@ -12,8 +12,6 @@ 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>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x108 0>; }; diff --git a/qcom/sun-mtp-qmp1000-v8-overlay.dts b/qcom/sun-mtp-qmp1000-v8-overlay.dts index 276d4ef2..200896b0 100644 --- a/qcom/sun-mtp-qmp1000-v8-overlay.dts +++ b/qcom/sun-mtp-qmp1000-v8-overlay.dts @@ -12,8 +12,6 @@ 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>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x40108 0>; }; diff --git a/qcom/sun-mtp-v8-overlay.dts b/qcom/sun-mtp-v8-overlay.dts index 82baf63c..45b44f41 100644 --- a/qcom/sun-mtp-v8-overlay.dts +++ b/qcom/sun-mtp-v8-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun MTP 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>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x40008 0>; }; diff --git a/qcom/sun-qrd-sku1-overlay.dts b/qcom/sun-qrd-sku1-overlay.dts index 24a4d3d6..15d9cb96 100644 --- a/qcom/sun-qrd-sku1-overlay.dts +++ b/qcom/sun-qrd-sku1-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU1"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x1000B 0>; }; diff --git a/qcom/sun-qrd-sku1-v8-overlay.dts b/qcom/sun-qrd-sku1-v8-overlay.dts index 90bc32f8..eea7ca7b 100644 --- a/qcom/sun-qrd-sku1-v8-overlay.dts +++ b/qcom/sun-qrd-sku1-v8-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU1 V8 Power Grid"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x3000B 0>; }; diff --git a/qcom/sun-qrd-sku2-v8-overlay.dts b/qcom/sun-qrd-sku2-v8-overlay.dts index 3cf89921..da4cb58b 100644 --- a/qcom/sun-qrd-sku2-v8-overlay.dts +++ b/qcom/sun-qrd-sku2-v8-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,8 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun QRD SKU2 V8 Power Grid"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x2000B 0>; }; diff --git a/qcom/sun-rcm-kiwi-overlay.dts b/qcom/sun-rcm-kiwi-overlay.dts index fe46bac7..24df83d0 100644 --- a/qcom/sun-rcm-kiwi-overlay.dts +++ b/qcom/sun-rcm-kiwi-overlay.dts @@ -12,7 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun RCM Kiwi WLAN"; compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, - <0x100026a 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x40015 0>; }; diff --git a/qcom/sun-rcm-kiwi-v8-overlay.dts b/qcom/sun-rcm-kiwi-v8-overlay.dts index bfc48fba..8f272406 100644 --- a/qcom/sun-rcm-kiwi-v8-overlay.dts +++ b/qcom/sun-rcm-kiwi-v8-overlay.dts @@ -12,7 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun RCM Kiwi WLAN V8 Power Grid"; compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, - <0x100026a 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x20015 0>; }; diff --git a/qcom/sun-rcm-overlay.dts b/qcom/sun-rcm-overlay.dts index 19d1d174..eb365700 100644 --- a/qcom/sun-rcm-overlay.dts +++ b/qcom/sun-rcm-overlay.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -11,7 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Sun RCM"; compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp", "qcom,rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, - <0x100026a 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x15 0>; }; diff --git a/qcom/sun-rcm-v8-overlay.dts b/qcom/sun-rcm-v8-overlay.dts index e8465ce0..2511a063 100644 --- a/qcom/sun-rcm-v8-overlay.dts +++ b/qcom/sun-rcm-v8-overlay.dts @@ -12,7 +12,6 @@ model = "Qualcomm Technologies, Inc. Sun RCM V8 Power Grid"; compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, - <0x100026a 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>; qcom,board-id = <0x30015 0>; }; diff --git a/qcom/sun-tp-v2.dts b/qcom/sun-tp-v2.dts deleted file mode 100644 index d5b4c88a..00000000 --- a/qcom/sun-tp-v2.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; - -#include "sun-v2.dtsi" -#include "sun-tp-v2.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Sun Alt. Thermal Profile v2 SoC"; - compatible = "qcom,sun"; - qcom,board-id = <0 0>; -}; diff --git a/qcom/sun-tp-v2.dtsi b/qcom/sun-tp-v2.dtsi deleted file mode 100644 index 74143fa8..00000000 --- a/qcom/sun-tp-v2.dtsi +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -#include "sun-tp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Sun Alt. Thermal Profile SoC"; - compatible = "qcom,sun"; - qcom,msm-id = <0x100026a 0x20000>; -}; diff --git a/qcom/sun-tp.dts b/qcom/sun-tp.dts deleted file mode 100644 index 8c8e9468..00000000 --- a/qcom/sun-tp.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; - -#include "sun.dtsi" -#include "sun-tp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. Sun Alt. Thermal Profile SoC"; - compatible = "qcom,sun"; - qcom,board-id = <0 0>; -}; diff --git a/qcom/sun-tp.dtsi b/qcom/sun-tp.dtsi deleted file mode 100644 index 12fbf138..00000000 --- a/qcom/sun-tp.dtsi +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/ { - model = "Qualcomm Technologies, Inc. Sun Alt. Thermal Profile SoC"; - compatible = "qcom,sun"; - qcom,msm-id = <0x100026a 0x10000>; -}; diff --git a/qcom/sunp-tp-v2.dts b/qcom/sunp-tp-v2.dts deleted file mode 100644 index 579201b5..00000000 --- a/qcom/sunp-tp-v2.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; - -#include "sunp-v2.dtsi" -#include "sunp-tp-v2.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. SunP v2 Alt. Thermal Profile SoC"; - compatible = "qcom,sunp"; - qcom,board-id = <0 0>; -}; diff --git a/qcom/sunp-tp-v2.dtsi b/qcom/sunp-tp-v2.dtsi deleted file mode 100644 index f1b83c09..00000000 --- a/qcom/sunp-tp-v2.dtsi +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -#include "sun-tp-v2.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. SunP Alt. Thermal Profile v2 SoC"; - compatible = "qcom,sunp"; - qcom,msm-id = <0x100027f 0x20000>; -}; diff --git a/qcom/sunp-tp.dts b/qcom/sunp-tp.dts deleted file mode 100644 index a066890c..00000000 --- a/qcom/sunp-tp.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -/dts-v1/; - -#include "sunp.dtsi" -#include "sunp-tp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. SunP Alt. Thermal Profile SoC"; - compatible = "qcom,sunp"; - qcom,board-id = <0 0>; -}; diff --git a/qcom/sunp-tp.dtsi b/qcom/sunp-tp.dtsi deleted file mode 100644 index 5d4d447e..00000000 --- a/qcom/sunp-tp.dtsi +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. - */ - -#include "sun-tp.dtsi" - -/ { - model = "Qualcomm Technologies, Inc. SunP Alt. Thermal Profile SoC"; - compatible = "qcom,sunp"; - qcom,msm-id = <0x100027f 0x10000>; -};