diff --git a/include/nvidia-oot/dt-bindings/thermal/tegra234-bpmp-thermal-oot.h b/include/nvidia-oot/dt-bindings/thermal/tegra234-bpmp-thermal-oot.h
deleted file mode 100644
index 41a5efe..0000000
--- a/include/nvidia-oot/dt-bindings/thermal/tegra234-bpmp-thermal-oot.h
+++ /dev/null
@@ -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
diff --git a/overlay/tegra234-p3737-0000+p3701-0000.dts b/overlay/tegra234-p3737-0000+p3701-0000.dts
index 2481acc..7cba6d5 100644
--- a/overlay/tegra234-p3737-0000+p3701-0000.dts
+++ b/overlay/tegra234-p3737-0000+p3701-0000.dts
@@ -20,12 +20,6 @@
 	fragment-t234-p3737-p3701@0 {
 		target-path = "/";
 		__overlay__ {
-			bpmp {
-				thermal {
-					status = "okay";
-				};
-			};
-
 			cpus {
 				idle-states {
 					c7 {
@@ -78,10 +72,6 @@
 				soc2-thermal {
 					status = "okay";
 				};
-
-				tj-thermal {
-					status = "okay";
-				};
 			};
 
 			bus@0 {
diff --git a/overlay/tegra234-p3768-0000+p3767-0000.dts b/overlay/tegra234-p3768-0000+p3767-0000.dts
index 57e5810..55737d8 100644
--- a/overlay/tegra234-p3768-0000+p3767-0000.dts
+++ b/overlay/tegra234-p3768-0000+p3767-0000.dts
@@ -207,12 +207,6 @@
 				status = "okay";
 			};
 
-			bpmp {
-				thermal {
-					status = "okay";
-				};
-			};
-
 			thermal-zones {
 				cpu-thermal {
 					status = "okay";
@@ -245,10 +239,6 @@
 				soc2-thermal {
 					status = "okay";
 				};
-
-				tj-thermal {
-					status = "okay";
-				};
 			};
 		};
 	};
diff --git a/overlay/tegra234-soc-thermal.dtsi b/overlay/tegra234-soc-thermal.dtsi
index 01f494c..6370172 100644
--- a/overlay/tegra234-soc-thermal.dtsi
+++ b/overlay/tegra234-soc-thermal.dtsi
@@ -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";
 				};
 			};
 		};