From cc8f9509e010e59dbe79b1e8ce5eee43be59e47b Mon Sep 17 00:00:00 2001 From: Melody Olvera Date: Mon, 11 Mar 2024 14:39:45 -0700 Subject: [PATCH 1/2] ARM: dts: qcom: Add package ID to msm-IDs for sun SoC Add additional device trees and msm-IDs to support an additional package ID. Additional packages may support different hardware settings and can be configured in their package specific device trees. Change-Id: I0f6d71aa65a891749a2f78e430f75fd5a6d716d7 Signed-off-by: Melody Olvera --- 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, 194 insertions(+), 39 deletions(-) create mode 100644 qcom/sun-tp-v2.dts create mode 100644 qcom/sun-tp-v2.dtsi create mode 100644 qcom/sun-tp.dts create mode 100644 qcom/sun-tp.dtsi create mode 100644 qcom/sunp-tp-v2.dts create mode 100644 qcom/sunp-tp-v2.dtsi create mode 100644 qcom/sunp-tp.dts create mode 100644 qcom/sunp-tp.dtsi diff --git a/qcom/Makefile b/qcom/Makefile index 8429f688..848b58b5 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_APQ_BASE_DTB += sunp.dtb sunp-v2.dtb +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_BOARDS += \ sun-mtp-3.5mm-overlay.dtbo \ diff --git a/qcom/platform_map.bzl b/qcom/platform_map.bzl index 66cd194e..4f773ec1 100644 --- a/qcom/platform_map.bzl +++ b/qcom/platform_map.bzl @@ -12,6 +12,16 @@ _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 c582c4e1..e97fb466 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,7 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, + <0x100026a 0x20000>; qcom,board-id = <0x10021 0>; }; diff --git a/qcom/sun-cdp-kiwi-overlay.dts b/qcom/sun-cdp-kiwi-overlay.dts index d4e41ba8..433c2812 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 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 f9dd0262..0e77c536 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x60001 0>; }; diff --git a/qcom/sun-cdp-nfc-overlay.dts b/qcom/sun-cdp-nfc-overlay.dts index d5929915..d0031b40 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-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -11,6 +11,8 @@ / { 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 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 cf7161e6..4bda478f 100644 --- a/qcom/sun-cdp-no-display-overlay.dts +++ b/qcom/sun-cdp-no-display-overlay.dts @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x30001 0>; }; diff --git a/qcom/sun-cdp-overlay.dts b/qcom/sun-cdp-overlay.dts index 0c09832a..4ba26c03 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <1 0>; }; diff --git a/qcom/sun-cdp-v8-overlay.dts b/qcom/sun-cdp-v8-overlay.dts index 68c3aa4f..02f6685d 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 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 8bf006f8..580bf88f 100644 --- a/qcom/sun-mtp-3.5mm-overlay.dts +++ b/qcom/sun-mtp-3.5mm-overlay.dts @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x60008 0>; }; diff --git a/qcom/sun-mtp-kiwi-overlay.dts b/qcom/sun-mtp-kiwi-overlay.dts index ce7816c1..d5444429 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 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 cd0d10f3..dfaf396c 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x50008 0>; }; diff --git a/qcom/sun-mtp-nfc-overlay.dts b/qcom/sun-mtp-nfc-overlay.dts index 6aa03e84..49f86246 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-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -11,6 +11,8 @@ / { 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x30008 0>; }; diff --git a/qcom/sun-mtp-overlay.dts b/qcom/sun-mtp-overlay.dts index 983d05f7..8da7d8eb 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <8 0>; }; diff --git a/qcom/sun-mtp-qmp1000-overlay.dts b/qcom/sun-mtp-qmp1000-overlay.dts index 345c4e6d..45754198 100644 --- a/qcom/sun-mtp-qmp1000-overlay.dts +++ b/qcom/sun-mtp-qmp1000-overlay.dts @@ -12,6 +12,8 @@ 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,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 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 200896b0..276d4ef2 100644 --- a/qcom/sun-mtp-qmp1000-v8-overlay.dts +++ b/qcom/sun-mtp-qmp1000-v8-overlay.dts @@ -12,6 +12,8 @@ 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,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x40108 0>; }; diff --git a/qcom/sun-mtp-v8-overlay.dts b/qcom/sun-mtp-v8-overlay.dts index 45b44f41..82baf63c 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x40008 0>; }; diff --git a/qcom/sun-qrd-sku1-overlay.dts b/qcom/sun-qrd-sku1-overlay.dts index 15d9cb96..24a4d3d6 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 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 eea7ca7b..90bc32f8 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 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 da4cb58b..3cf89921 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,6 +12,8 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x2000B 0>; }; diff --git a/qcom/sun-rcm-kiwi-overlay.dts b/qcom/sun-rcm-kiwi-overlay.dts index 24df83d0..fe46bac7 100644 --- a/qcom/sun-rcm-kiwi-overlay.dts +++ b/qcom/sun-rcm-kiwi-overlay.dts @@ -12,6 +12,7 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, + <0x100026a 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 8f272406..bfc48fba 100644 --- a/qcom/sun-rcm-kiwi-v8-overlay.dts +++ b/qcom/sun-rcm-kiwi-v8-overlay.dts @@ -12,6 +12,7 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, + <0x100026a 0x20000>; qcom,board-id = <0x20015 0>; }; diff --git a/qcom/sun-rcm-overlay.dts b/qcom/sun-rcm-overlay.dts index eb365700..19d1d174 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 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -11,6 +11,7 @@ / { model = "Qualcomm Technologies, Inc. Sun RCM"; compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp", "qcom,rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, + <0x100026a 0x20000>; qcom,board-id = <0x15 0>; }; diff --git a/qcom/sun-rcm-v8-overlay.dts b/qcom/sun-rcm-v8-overlay.dts index 2511a063..e8465ce0 100644 --- a/qcom/sun-rcm-v8-overlay.dts +++ b/qcom/sun-rcm-v8-overlay.dts @@ -12,6 +12,7 @@ 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>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <0x100026a 0x10000>, + <0x100026a 0x20000>; qcom,board-id = <0x30015 0>; }; diff --git a/qcom/sun-tp-v2.dts b/qcom/sun-tp-v2.dts new file mode 100644 index 00000000..d5b4c88a --- /dev/null +++ b/qcom/sun-tp-v2.dts @@ -0,0 +1,15 @@ +// 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 new file mode 100644 index 00000000..74143fa8 --- /dev/null +++ b/qcom/sun-tp-v2.dtsi @@ -0,0 +1,12 @@ +// 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 new file mode 100644 index 00000000..8c8e9468 --- /dev/null +++ b/qcom/sun-tp.dts @@ -0,0 +1,15 @@ +// 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 new file mode 100644 index 00000000..12fbf138 --- /dev/null +++ b/qcom/sun-tp.dtsi @@ -0,0 +1,10 @@ +// 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 new file mode 100644 index 00000000..579201b5 --- /dev/null +++ b/qcom/sunp-tp-v2.dts @@ -0,0 +1,15 @@ +// 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 new file mode 100644 index 00000000..f1b83c09 --- /dev/null +++ b/qcom/sunp-tp-v2.dtsi @@ -0,0 +1,12 @@ +// 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 new file mode 100644 index 00000000..a066890c --- /dev/null +++ b/qcom/sunp-tp.dts @@ -0,0 +1,15 @@ +// 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 new file mode 100644 index 00000000..5d4d447e --- /dev/null +++ b/qcom/sunp-tp.dtsi @@ -0,0 +1,12 @@ +// 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>; +}; From b767fb4f68507174b6f521a19ac825bdb2370da9 Mon Sep 17 00:00:00 2001 From: Manaf Meethalavalappu Pallikunhi Date: Mon, 25 Mar 2024 15:57:34 +0530 Subject: [PATCH 2/2] ARM: dts: qcom: update thermal zone trips for tsens for sun-tp Update various thermal zone trip thresholds for all tsens for sun thermal profile package based on latest recommendation. Change-Id: I73beefbd4d590bc749e77ba5d4b97d74c5afbe43 Signed-off-by: Manaf Meethalavalappu Pallikunhi --- qcom/sun-tp.dtsi | 542 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 542 insertions(+) diff --git a/qcom/sun-tp.dtsi b/qcom/sun-tp.dtsi index 12fbf138..327e4d0d 100644 --- a/qcom/sun-tp.dtsi +++ b/qcom/sun-tp.dtsi @@ -8,3 +8,545 @@ compatible = "qcom,sun"; qcom,msm-id = <0x100026a 0x10000>; }; + +&thermal_zones { + aoss-0 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-0-0 { + trips { + cpu0-emerg0-cfg { + temperature = <118000>; + }; + + cpu0-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-0-1 { + trips { + cpu0-emerg1-cfg { + temperature = <118000>; + }; + + cpu0-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-1-0 { + trips { + cpu1-emerg0-cfg { + temperature = <118000>; + }; + + cpu1-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-1-1 { + trips { + cpu1-emerg1-cfg { + temperature = <118000>; + }; + + cpu1-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-2-0 { + trips { + cpu2-emerg0-cfg { + temperature = <118000>; + }; + + cpu2-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-2-1 { + trips { + cpu2-emerg1-cfg { + temperature = <118000>; + }; + + cpu2-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-3-0 { + trips { + cpu3-emerg0-cfg { + temperature = <118000>; + }; + + cpu3-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-3-1 { + trips { + cpu3-emerg1-cfg { + temperature = <118000>; + }; + + cpu3-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-4-0 { + trips { + cpu4-emerg0-cfg { + temperature = <118000>; + }; + + cpu4-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-4-1 { + trips { + cpu4-emerg1-cfg { + temperature = <118000>; + }; + + cpu4-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-5-0 { + trips { + cpu5-emerg0-cfg { + temperature = <118000>; + }; + + cpu5-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-0-5-1 { + trips { + cpu5-emerg1-cfg { + temperature = <118000>; + }; + + cpu5-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpuss-0-0 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpuss-0-1 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + aoss-1 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-1-0-0 { + trips { + cpu6-emerg0-cfg { + temperature = <118000>; + }; + + cpu6-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-1-0-1 { + trips { + cpu6-emerg1-cfg { + temperature = <118000>; + }; + + cpu6-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-1-1-0 { + trips { + cpu7-emerg0-cfg { + temperature = <118000>; + }; + + cpu7-emerg0-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpu-1-1-1 { + trips { + cpu7-emerg1-cfg { + temperature = <118000>; + }; + + cpu7-emerg1-1-cfg { + temperature = <120000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpuss-1-0 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + cpuss-1-1 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + nsphvx-0 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + nsphvx-1 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + nsphvx-2 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + nsphmx-0 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + nsphmx-1 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + nsphmx-2 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + nsphmx-3 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + ddr { + trips { + ddr0-config { + temperature = <100000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + aoss-2 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-0 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-1 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-2 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-3 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-4 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-5 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-6 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + gpuss-7 { + trips { + tj_cfg { + temperature = <105000>; + }; + + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + mdmss-0 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + mdmss-1 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + mdmss-2 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + mdmss-3 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + camera-0 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + camera-1 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + video { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; + + aoss-3 { + trips { + reset-mon-cfg { + temperature = <125000>; + }; + }; + }; +};