Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

arm: mach-k3: Export common fdt fixups for use in board code

Browse Source 
Avoid code duplication by making the common TI K3 device tree fixup
functions to be reusable by board-specific code.

Signed-off-by: João Paulo Gonçalves <joao.goncalves@toradex.com>
This commit is contained in:
João Paulo Gonçalves
2025-06-23 14:39:55 -03:00
committed by Tom Rini
parent 2b7c6b6f3c
commit 9e672e4260
10 changed files with 51 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-k3/am62ax/am62a7_fdt.c
View File

@@ -3,11 +3,10 @@
* Copyright (C) 2024 Texas Instruments Incorporated - https://www.ti.com/
*/
#include <asm/arch/k3-common-fdt.h>
#include <asm/hardware.h>
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
fdt_fixup_reserved(blob, "tfa", CONFIG_K3_ATF_LOAD_ADDR, 0x80000);

40
arch/arm/mach-k3/am62px/am62p5_fdt.c
View File

@@ -3,8 +3,8 @@
* 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>
static void fdt_fixup_cores_wdt_nodes_am62p(void *blob, int core_nr)
@@ -38,42 +38,6 @@ static void fdt_fixup_canfd_nodes_am62p(void *blob, bool has_canfd)
}
}
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_am62p(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_cpu_freq_nodes_am62p(void *blob, int max_freq)
{
if (max_freq >= 1250000000)
@@ -90,7 +54,7 @@ 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_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);

41
arch/arm/mach-k3/am62x/am625_fdt.c
View File

@@ -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);

3
arch/arm/mach-k3/am65x/am654_fdt.c
View File

@@ -3,10 +3,9 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#include <asm/arch/k3-common-fdt.h>
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);

38
arch/arm/mach-k3/common_fdt.c
View File

@@ -3,11 +3,11 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#include <asm/arch/k3-common-fdt.h>
#include "common.h"
#include <dm.h>
#include <fdt_support.h>
#include <linux/soc/ti/ti_sci_protocol.h>
#include "common_fdt.h"
static int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name)
{
@@ -164,3 +164,39 @@ add_carveout:
return 0;
}
static int fdt_fixup_critical_trips(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;
}
void fdt_fixup_thermal_critical_trips_k3(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_critical_trips(blob, zone, maxc) < 0)
printf("Failed to set temperature in %s critical trips\n",
fdt_get_name(blob, zone, NULL));
}
}

7
arch/arm/mach-k3/common_fdt.h → arch/arm/mach-k3/include/mach/k3-common-fdt.h
View File

@@ -3,12 +3,13 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#ifndef _COMMON_FDT_H
#define _COMMON_FDT_H
#ifndef _K3_COMMON_FDT_H
#define _K3_COMMON_FDT_H
int fdt_fixup_msmc_ram_k3(void *blob);
int fdt_del_node_path(void *blob, const char *path);
int fdt_fixup_reserved(void *blob, const char *name,
unsigned int new_address, unsigned int new_size);
void fdt_fixup_thermal_critical_trips_k3(void *blob, int maxc);
#endif /* _COMMON_FDT_H */
#endif /* _K3_COMMON_FDT_H */

3
arch/arm/mach-k3/j721e/j721e_fdt.c
View File

@@ -3,10 +3,9 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#include <asm/arch/k3-common-fdt.h>
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);

3
arch/arm/mach-k3/j721s2/j721s2_fdt.c
View File

@@ -3,10 +3,9 @@
* Copyright 2023 Toradex - https://www.toradex.com/
*/
#include <asm/arch/k3-common-fdt.h>
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);

2
arch/arm/mach-k3/j722s/j722s_fdt.c
View File

@@ -3,8 +3,8 @@
* 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>
int ft_system_setup(void *blob, struct bd_info *bd)

3
arch/arm/mach-k3/j784s4/j784s4_fdt.c
View File

@@ -6,10 +6,9 @@
* Apurva Nandan <a-nandan@ti.com>
*/
#include <asm/arch/k3-common-fdt.h>
#include <fdt_support.h>
#include "../common_fdt.h"
int ft_system_setup(void *blob, struct bd_info *bd)
{
return fdt_fixup_msmc_ram_k3(blob);