diff options
author | Jacky Bai <ping.bai@nxp.com> | 2019-06-12 17:41:47 +0800 |
---|---|---|
committer | Jacky Bai <ping.bai@nxp.com> | 2019-07-04 19:59:43 +0800 |
commit | 2502709f60de5b182cf5bf25cad14953be650883 (patch) | |
tree | 196e89f7fdebae2b1eada3fb116f6c545d4e4262 /plat/imx/imx8m/imx8mq | |
parent | b01e0ad5cd0e6a752ef6b3481b0040d7ecd780e1 (diff) |
plat: imx8m: Add caam module init on imx8m
CAAM module must be initialized in secure world
before it can be used in non-secure world.
Change-Id: I042893667ddef99d8b6fc3902847d516d8591996
Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Diffstat (limited to 'plat/imx/imx8m/imx8mq')
-rw-r--r-- | plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 6 | ||||
-rw-r--r-- | plat/imx/imx8m/imx8mq/include/platform_def.h | 8 | ||||
-rw-r--r-- | plat/imx/imx8m/imx8mq/platform.mk | 3 |
3 files changed, 6 insertions, 11 deletions
diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index ce55d7f3..26a3b364 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -24,6 +24,7 @@ #include <gpc.h> #include <imx_aipstz.h> #include <imx_uart.h> +#include <imx8m_caam.h> #include <plat_imx8.h> static const mmap_region_t imx_mmap[] = { @@ -129,10 +130,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, imx_aipstz_init(aipstz); - /* config CAAM JRaMID set MID to Cortex A */ - mmio_write_32(CAAM_JR0MID, CAAM_NS_MID); - mmio_write_32(CAAM_JR1MID, CAAM_NS_MID); - mmio_write_32(CAAM_JR2MID, CAAM_NS_MID); + imx8m_caam_init(); #if DEBUG_CONSOLE static console_uart_t console; diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h index 959b820c..3c212e37 100644 --- a/plat/imx/imx8m/imx8mq/include/platform_def.h +++ b/plat/imx/imx8m/imx8mq/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -70,6 +70,7 @@ #define IMX_SNVS_BASE U(0x30370000) #define IMX_NOC_BASE U(0x32700000) #define IMX_TZASC_BASE U(0x32F80000) +#define IMX_CAAM_BASE U(0x30900000) #define IMX_IOMUX_GPR_BASE U(0x30340000) #define IMX_DDRC_BASE U(0x3d400000) #define IMX_DDRPHY_BASE U(0x3c000000) @@ -122,8 +123,3 @@ #define DEBUG_CONSOLE 0 #define IMX_WDOG_B_RESET - -#define CAAM_JR0MID U(0x30900010) -#define CAAM_JR1MID U(0x30900018) -#define CAAM_JR2MID U(0x30900020) -#define CAAM_NS_MID U(0x1) diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk index d6879bf7..44ce5558 100644 --- a/plat/imx/imx8m/imx8mq/platform.mk +++ b/plat/imx/imx8m/imx8mq/platform.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -22,6 +22,7 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ plat/imx/imx8m/imx8mq/imx8mq_psci.c \ plat/imx/imx8m/gpc_common.c \ plat/imx/imx8m/imx_aipstz.c \ + plat/imx/imx8m/imx8m_caam.c \ plat/imx/imx8m/imx8m_psci_common.c \ plat/imx/imx8m/imx8mq/gpc.c \ plat/imx/common/imx8_topology.c \ |