1 files changed, 37 insertions, 36 deletions

diff --git a/arch/arm/mach-k3/am62px/am62p5_fdt.c b/arch/arm/mach-k3/am62px/am62p5_fdt.c
index 2c40fa5a594..4a5ff594df6 100644
--- a/arch/arm/mach-k3/am62px/am62p5_fdt.c
+++ b/arch/arm/mach-k3/am62px/am62p5_fdt.c
@@ -3,9 +3,10 @@
  * Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
  */
 
+#include <asm/arch/k3-common-fdt.h>
 #include <asm/hardware.h>
-#include "../common_fdt.h"
 #include <fdt_support.h>
+#include <fdtdec.h>
 
 static void fdt_fixup_cores_wdt_nodes_am62p(void *blob, int core_nr)
 {
@@ -38,50 +39,49 @@ static void fdt_fixup_canfd_nodes_am62p(void *blob, bool has_canfd)
 	}
 }
 
-static int fdt_fixup_trips_node(void *blob, int zoneoffset, int maxc)
+static void fdt_fixup_cpu_freq_nodes_am62p(void *blob, int max_freq)
 {
-	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 (max_freq >= 1250000000)
+		return;
 
-		if (fdt_setprop_u32(blob, trip, "temperature", 1000 * maxc) < 0)
-			return -1;
+	if (max_freq <= 1000000000) {
+		fdt_del_node_path(blob, "/opp-table/opp-1250000000");
+		fdt_del_node_path(blob, "/opp-table/opp-1400000000");
 	}
-
-	return 0;
 }
 
-static void fdt_fixup_thermal_zone_nodes_am62p(void *blob, int maxc)
+static void fdt_fixup_thermal_cooling_device_cpus_am62p(void *blob, int core_nr)
 {
-	int node, zone;
+	static const char * const thermal_path[] = {
+		"/thermal-zones/main0-thermal/cooling-maps/map0",
+		"/thermal-zones/main1-thermal/cooling-maps/map0",
+		"/thermal-zones/main2-thermal/cooling-maps/map0"
+	};
 
-	node = fdt_path_offset(blob, "/thermal-zones");
-	if (node < 0)
-		return;
+	int node, cnt, i, ret;
+	u32 cooling_dev[12];
 
-	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));
-	}
-}
+	for (i = 0; i < ARRAY_SIZE(thermal_path); i++) {
+		int new_count = core_nr * 3;  /* Each CPU has 3 entries */
+		int j;
 
-static void fdt_fixup_cpu_freq_nodes_am62p(void *blob, int max_freq)
-{
-	if (max_freq >= 1250000000)
-		return;
+		node = fdt_path_offset(blob, thermal_path[i]);
+		if (node < 0)
+			continue;
 
-	if (max_freq <= 1000000000) {
-		fdt_del_node_path(blob, "/opp-table/opp-1250000000");
-		fdt_del_node_path(blob, "/opp-table/opp-1400000000");
+		cnt = fdtdec_get_int_array_count(blob, node, "cooling-device",
+						 cooling_dev, ARRAY_SIZE(cooling_dev));
+		if (cnt < 0)
+			continue;
+
+		for (j = 0; j < new_count; j++)
+			cooling_dev[j] = cpu_to_fdt32(cooling_dev[j]);
+
+		ret = fdt_setprop(blob, node, "cooling-device", cooling_dev,
+				  new_count * sizeof(u32));
+		if (ret < 0)
+			printf("Error %s, cooling-device setprop failed %d\n",
+			       thermal_path[i], ret);
 	}
 }
 
@@ -90,7 +90,8 @@ int ft_system_setup(void *blob, struct bd_info *bd)
 	fdt_fixup_cores_wdt_nodes_am62p(blob, k3_get_core_nr());
 	fdt_fixup_video_codec_nodes_am62p(blob, k3_has_video_codec());
 	fdt_fixup_canfd_nodes_am62p(blob, k3_has_canfd());
-	fdt_fixup_thermal_zone_nodes_am62p(blob, k3_get_max_temp());
+	fdt_fixup_thermal_critical_trips_k3(blob, k3_get_max_temp());
+	fdt_fixup_thermal_cooling_device_cpus_am62p(blob, k3_get_core_nr());
 	fdt_fixup_cpu_freq_nodes_am62p(blob, k3_get_a53_max_frequency());
 	fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);
 	fdt_fixup_reserved(blob, "optee", CONFIG_K3_OPTEE_LOAD_ADDR, 0x1800000);