Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-18 10:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge patch series "arm: mach-k3: j722s: Enable ESM to support watchdogs"

Browse source 
Keerthy <j-keerthy@ti.com> says:

The series enables watchdog support on J722S. It adds ESM initialization
to enable routing the watchdog events to trigger a SOC reset.

Link: https://lore.kernel.org/r/20250217105718.3109-1-j-keerthy@ti.com
This commit is contained in:
Tom Rini 2025-03-03 14:22:24 -06:00
commit 0928e3cc71
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
arch/arm/mach-k3/j722s/j722s_init.c
View file

@ -27,6 +27,9 @@ struct fwl_data cbass_main_fwls[] = {
u32 bootindex __section(".data");
static struct rom_extended_boot_data bootdata __section(".data");
#define CTRLMMR_MCU_RST_CTRL (MCU_CTRL_MMR0_BASE + 0x18170)
#define RST_CTRL_ESM_ERROR_RST_EN_Z_MASK (~BIT(17))
static void store_boot_info_from_rom(void)
{
bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX);
@ -161,11 +164,40 @@ static void k3_mem_init(void)
}
}
static __maybe_unused void enable_mcu_esm_reset(void)
{
/* Set CTRLMMR_MCU_RST_CTRL:MCU_ESM_ERROR_RST_EN_Z to '0' (low active) */
u32 stat = readl(CTRLMMR_MCU_RST_CTRL);
stat &= RST_CTRL_ESM_ERROR_RST_EN_Z_MASK;
writel(stat, CTRLMMR_MCU_RST_CTRL);
}
void board_init_f(ulong dummy)
{
int ret;
struct udevice *dev;
k3_spl_init();
k3_mem_init();
setup_qos();
if (IS_ENABLED(CONFIG_ESM_K3)) {
/* Probe/configure ESM0 */
ret = uclass_get_device_by_name(UCLASS_MISC, "esm@420000", &dev);
if (ret) {
printf("esm main init failed: %d\n", ret);
return;
}
/* Probe/configure MCUESM */
ret = uclass_get_device_by_name(UCLASS_MISC, "esm@4100000", &dev);
if (ret) {
printf("esm mcu init failed: %d\n", ret);
return;
}
enable_mcu_esm_reset();
}
}
static u32 __get_backup_bootmedia(u32 devstat)

3
configs/j722s_evm_r5_defconfig
View file

@ -124,4 +124,7 @@ CONFIG_TIMER=y
CONFIG_SPL_TIMER=y
CONFIG_OMAP_TIMER=y
CONFIG_LIB_RATIONAL=y
CONFIG_ESM_K3=y
CONFIG_SPL_DRIVERS_MISC=y
CONFIG_SPL_MISC=y
CONFIG_SPL_LIB_RATIONAL=y