1 files changed, 2 insertions, 39 deletions
diff --git a/arch/arm/mach-k3/am62x/am625_fdt.c b/arch/arm/mach-k3/am62x/am625_fdt.c
index ab9b573f3cf..e5d95ab7dd1 100644
--- a/arch/arm/mach-k3/am62x/am625_fdt.c
+++ b/arch/arm/mach-k3/am62x/am625_fdt.c
@@ -3,12 +3,11 @@
  * Copyright 2023 Toradex - https://www.toradex.com/
  */
 
+#include <asm/arch/k3-common-fdt.h>
 #include <asm/hardware.h>
 #include <fdt_support.h>
 #include <fdtdec.h>
 
-#include "../common_fdt.h"
-
 static void fdt_fixup_cores_nodes_am625(void *blob, int core_nr)
 {
 	char node_path[32];
@@ -40,42 +39,6 @@ static void fdt_fixup_pru_node_am625(void *blob, int has_pru)
 		fdt_del_node_path(blob, "/bus@f0000/pruss@30040000");
 }
 
-static int fdt_fixup_trips_node(void *blob, int zoneoffset, int maxc)
-{
-	int node, trip;
-
-	node = fdt_subnode_offset(blob, zoneoffset, "trips");
-	if (node < 0)
-		return -1;
-
-	fdt_for_each_subnode(trip, blob, node) {
-		const char *type = fdt_getprop(blob, trip, "type", NULL);
-
-		if (!type || (strncmp(type, "critical", 8) != 0))
-			continue;
-
-		if (fdt_setprop_u32(blob, trip, "temperature", 1000 * maxc) < 0)
-			return -1;
-	}
-
-	return 0;
-}
-
-static void fdt_fixup_thermal_zone_nodes_am625(void *blob, int maxc)
-{
-	int node, zone;
-
-	node = fdt_path_offset(blob, "/thermal-zones");
-	if (node < 0)
-		return;
-
-	fdt_for_each_subnode(zone, blob, node) {
-		if (fdt_fixup_trips_node(blob, zone, maxc) < 0)
-			printf("Failed to set temperature in %s critical trips\n",
-			       fdt_get_name(blob, zone, NULL));
-	}
-}
-
 static void fdt_fixup_thermal_cooling_device_cpus_am625(void *blob, int core_nr)
 {
 	static const char * const thermal_path[] = {
@@ -115,7 +78,7 @@ int ft_system_setup(void *blob, struct bd_info *bd)
 	fdt_fixup_cores_nodes_am625(blob, k3_get_core_nr());
 	fdt_fixup_gpu_nodes_am625(blob, k3_has_gpu());
 	fdt_fixup_pru_node_am625(blob, k3_has_pru());
-	fdt_fixup_thermal_zone_nodes_am625(blob, k3_get_max_temp());
+	fdt_fixup_thermal_critical_trips_k3(blob, k3_get_max_temp());
 	fdt_fixup_thermal_cooling_device_cpus_am625(blob, k3_get_core_nr());
 	fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);
 	fdt_fixup_reserved(blob, "optee", CONFIG_K3_OPTEE_LOAD_ADDR, 0x1800000);