From 203070088f86fea8e2b4ba83e2b1a73fdece1daf Mon Sep 17 00:00:00 2001 From: Yi-Wei Wang Date: Wed, 9 Oct 2024 13:38:50 +0800 Subject: [PATCH] t23x: dts: restructure soctherm sensors Previously soctherm sensors were included in platform-level (cvm+cvb) files. This change moves them to module-level files, since the settings are module-specific. Bug 4893772 Signed-off-by: Yi-Wei Wang Change-Id: I3b52dbc6f3183ef18087921cc2782f46d3229fa0 Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3226551 (cherry picked from commit b75727c6641982a6f914c987ab07cc7ebcdaf4b8) Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3227430 Reviewed-by: Brad Griffis GVS: buildbot_gerritrpt --- nv-platform/tegra234-p3701-0000.dtsi | 4 ++ ...ra234-p3737-0000+p3701-xxxx-nv-common.dtsi | 38 ------------------- ...ra234-p3740-0002+p3701-0008-nv-common.dtsi | 24 ------------ nv-platform/tegra234-p3767-0000.dtsi | 4 ++ ...ra234-p3768-0000+p3767-xxxx-nv-common.dtsi | 38 ------------------- nv-soc/tegra234-soc-thermal.dtsi | 18 +++++++++ 6 files changed, 26 insertions(+), 100 deletions(-) diff --git a/nv-platform/tegra234-p3701-0000.dtsi b/nv-platform/tegra234-p3701-0000.dtsi index 8a911aa..2bb8cf0 100644 --- a/nv-platform/tegra234-p3701-0000.dtsi +++ b/nv-platform/tegra234-p3701-0000.dtsi @@ -2,6 +2,10 @@ // SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include "tegra234-p3701-0000-prod-overlay.dtsi" +#include "nv-soc/tegra234-soc-thermal.dtsi" +#include "nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi" +#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi" +#include "nv-soc/tegra234-soc-thermal-trip-event.dtsi" / { bus@0 { diff --git a/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi b/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi index 41cba2e..929b828 100644 --- a/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi +++ b/nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi @@ -2,10 +2,6 @@ // SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include "nv-soc/tegra234-overlay.dtsi" -#include "nv-soc/tegra234-soc-thermal.dtsi" -#include "nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi" -#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi" -#include "nv-soc/tegra234-soc-thermal-trip-event.dtsi" #include "nv-soc/tegra234-soc-audio-dai-links.dtsi" #include "nv-soc/tegra234-soc-camera.dtsi" #include "tegra234-p3737-0000.dtsi" @@ -37,40 +33,6 @@ status = "okay"; }; - thermal-zones { - cpu-thermal { - status = "okay"; - }; - - cv0-thermal { - status = "okay"; - }; - - cv1-thermal { - status = "okay"; - }; - - cv2-thermal { - status = "okay"; - }; - - gpu-thermal { - status = "okay"; - }; - - soc0-thermal { - status = "okay"; - }; - - soc1-thermal { - status = "okay"; - }; - - soc2-thermal { - status = "okay"; - }; - }; - bus@0 { smmu_test { compatible = "nvidia,smmu_test"; diff --git a/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi index afb087a..9a82331 100644 --- a/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi +++ b/nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi @@ -2,10 +2,6 @@ // SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include "nv-soc/tegra234-overlay.dtsi" -#include "nv-soc/tegra234-soc-thermal.dtsi" -#include "nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi" -#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi" -#include "nv-soc/tegra234-soc-thermal-trip-event.dtsi" #include "nv-soc/tegra234-soc-camera.dtsi" #include "tegra234-camera-p3785.dtsi" #include "tegra234-p3740-0002.dtsi" @@ -39,8 +35,6 @@ thermal-zones { cpu-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; @@ -49,8 +43,6 @@ }; cv0-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; @@ -59,8 +51,6 @@ }; cv1-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; @@ -69,8 +59,6 @@ }; cv2-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; @@ -79,8 +67,6 @@ }; gpu-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; @@ -89,8 +75,6 @@ }; soc0-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; @@ -99,8 +83,6 @@ }; soc1-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; @@ -109,18 +91,12 @@ }; soc2-thermal { - status = "okay"; - cooling-maps { map-hot-surface-alert { cooling-device = <&hot_surface_alert 0 0>; }; }; }; - - tj-thermal { - status = "okay"; - }; }; bus@0 { diff --git a/nv-platform/tegra234-p3767-0000.dtsi b/nv-platform/tegra234-p3767-0000.dtsi index e64ad69..271f1f8 100644 --- a/nv-platform/tegra234-p3767-0000.dtsi +++ b/nv-platform/tegra234-p3767-0000.dtsi @@ -4,6 +4,10 @@ #include #include #include +#include "nv-soc/tegra234-soc-thermal.dtsi" +#include "nv-soc/tegra234-soc-thermal-slowdown-corepair.dtsi" +#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi" +#include "nv-soc/tegra234-soc-thermal-trip-event.dtsi" / { bus@0 { diff --git a/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi index 785bbd4..42bdfaa 100644 --- a/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi +++ b/nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi @@ -2,10 +2,6 @@ // SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. #include "nv-soc/tegra234-overlay.dtsi" -#include "nv-soc/tegra234-soc-thermal.dtsi" -#include "nv-soc/tegra234-soc-thermal-slowdown-corepair.dtsi" -#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi" -#include "nv-soc/tegra234-soc-thermal-trip-event.dtsi" #include "nv-soc/tegra234-soc-audio-dai-links.dtsi" #include "tegra234-p3768-0000.dtsi" #include "tegra234-p3767-0000.dtsi" @@ -333,40 +329,6 @@ status = "okay"; }; - thermal-zones { - cpu-thermal { - status = "okay"; - }; - - gpu-thermal { - status = "okay"; - }; - - cv0-thermal { - status = "okay"; - }; - - cv1-thermal { - status = "okay"; - }; - - cv2-thermal { - status = "okay"; - }; - - soc0-thermal { - status = "okay"; - }; - - soc1-thermal { - status = "okay"; - }; - - soc2-thermal { - status = "okay"; - }; - }; - tegra-hsp@b950000 { status = "okay"; }; diff --git a/nv-soc/tegra234-soc-thermal.dtsi b/nv-soc/tegra234-soc-thermal.dtsi index 2ec1218..59ee88a 100644 --- a/nv-soc/tegra234-soc-thermal.dtsi +++ b/nv-soc/tegra234-soc-thermal.dtsi @@ -6,46 +6,64 @@ / { thermal-zones { cpu-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; gpu-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; cv0-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; cv1-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; cv2-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; soc0-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; soc1-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; soc2-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; }; tj-thermal { + status = "okay"; + polling-delay = ; polling-delay-passive = ; };