mirror of
git://nv-tegra.nvidia.com/device/hardware/nvidia/t23x-public-dts.git
synced 2025-12-22 09:12:02 +03:00
t23x: overlay: Remove duplicate thermal entries
Remove duplicate thermal entries which already landed on the mainline
v6.5 and were backported.
Bug 3960800
Bug 4035713
Bug 4204722
Signed-off-by: Yi-Wei Wang <yiweiw@nvidia.com>
Change-Id: Iaa7bbe01ed1cb6135ea360378559fcd931b15d75
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2944082
(cherry picked from commit 5108617a44)
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2944438
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
91567f1536
commit
37b6533aaf
@@ -1,19 +0,0 @@
|
||||
/*
|
||||
* This header provides constants for binding nvidia,tegra234-bpmp-thermal.
|
||||
*/
|
||||
|
||||
#ifndef _DT_BINDINGS_THERMAL_TEGRA234_BPMP_THERMAL_H
|
||||
#define _DT_BINDINGS_THERMAL_TEGRA234_BPMP_THERMAL_H
|
||||
|
||||
#define TEGRA234_THERMAL_ZONE_CPU 0
|
||||
#define TEGRA234_THERMAL_ZONE_GPU 1
|
||||
#define TEGRA234_THERMAL_ZONE_CV0 2
|
||||
#define TEGRA234_THERMAL_ZONE_CV1 3
|
||||
#define TEGRA234_THERMAL_ZONE_CV2 4
|
||||
#define TEGRA234_THERMAL_ZONE_SOC0 5
|
||||
#define TEGRA234_THERMAL_ZONE_SOC1 6
|
||||
#define TEGRA234_THERMAL_ZONE_SOC2 7
|
||||
#define TEGRA234_THERMAL_ZONE_TJ_MAX 8
|
||||
#define TEGRA234_THERMAL_ZONE_COUNT 9
|
||||
|
||||
#endif
|
||||
@@ -21,12 +21,6 @@
|
||||
fragment-t234-p3737-p3701@0 {
|
||||
target-path = "/";
|
||||
__overlay__ {
|
||||
bpmp {
|
||||
thermal {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
cpus {
|
||||
idle-states {
|
||||
c7 {
|
||||
@@ -79,10 +73,6 @@
|
||||
soc2-thermal {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
tj-thermal {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
bus@0 {
|
||||
|
||||
@@ -251,12 +251,6 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
bpmp {
|
||||
thermal {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
cpu-thermal {
|
||||
status = "okay";
|
||||
@@ -289,10 +283,6 @@
|
||||
soc2-thermal {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
tj-thermal {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
// Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
|
||||
|
||||
#include <dt-bindings/thermal/tegra234-bpmp-thermal-oot.h>
|
||||
|
||||
#define TEGRA234_THERMAL_POLLING_DELAY 1000
|
||||
|
||||
/ {
|
||||
@@ -10,76 +8,50 @@
|
||||
fragment-t234-thermal@0 {
|
||||
target-path = "/";
|
||||
__overlay__ {
|
||||
bpmp {
|
||||
bpmp_thermal: thermal {
|
||||
compatible = "nvidia,tegra186-bpmp-thermal";
|
||||
#thermal-sensor-cells = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
cpu-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_CPU>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
gpu-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_GPU>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
cv0-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_CV0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
cv1-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_CV1>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
cv2-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_CV2>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
soc0-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_SOC0>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
soc1-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_SOC1>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
soc2-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_SOC2>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
tj-thermal {
|
||||
polling-delay = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
polling-delay-passive = <TEGRA234_THERMAL_POLLING_DELAY>;
|
||||
thermal-sensors = <&bpmp_thermal TEGRA234_THERMAL_ZONE_TJ_MAX>;
|
||||
status = "disabled";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user