diff options
| -rw-r--r-- | arch/arm/include/asm/arch-imx8m/imx-regs-imx8mm.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 3 | ||||
| -rw-r--r-- | board/freescale/imx8mm_evk/spl.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs-imx8mm.h b/arch/arm/include/asm/arch-imx8m/imx-regs-imx8mm.h index f7c6cefa744..d16f92813db 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs-imx8mm.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs-imx8mm.h @@ -127,6 +127,7 @@ #define IOMUXC_GPR22 (IOMUXC_GPR_BASE_ADDR + 0x58) #define GPR_TZASC_EN (1 << 0) +#define GPR_TZASC_SWAP_ID (1 << 1) #define GPR_TZASC_EN_LOCK (1 << 16) #define CNTCR_OFF 0x00 diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 93446775e5e..72b8862eb00 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -61,6 +61,9 @@ void enable_tzc380(void) /* Enable TZASC and lock setting */ setbits_le32(&gpr->gpr[10], GPR_TZASC_EN); setbits_le32(&gpr->gpr[10], GPR_TZASC_EN_LOCK); +#ifdef CONFIG_IMX8MM + setbits_le32(&gpr->gpr[10], GPR_TZASC_SWAP_ID); +#endif } void set_wdog_reset(struct wdog_regs *wdog) diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c index c063fdf17d0..d52a2e0850f 100644 --- a/board/freescale/imx8mm_evk/spl.c +++ b/board/freescale/imx8mm_evk/spl.c @@ -190,8 +190,7 @@ int power_init_board(void) void spl_board_init(void) { - /* TODO */ - /* enable_tzc380(); */ + enable_tzc380(); setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); |