diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-03-04 09:50:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 09:50:59 +0000 |
| commit | 22cde67b1f13853cd0eec095bd96e26900424d7a (patch) | |
| tree | 683a8aaf14c7af211b74661aac71bc6ec7c09dfe /plat | |
| parent | af3816789db46f69fca900e0fb8d086602219bb9 (diff) | |
| parent | 45a95e3908591634a3fbfd5490ec1ec695f89394 (diff) | |
| download | arm-trusted-firmware-22cde67b1f13853cd0eec095bd96e26900424d7a.tar.gz | |
Merge pull request #1837 from spencercw/master
imx: Configure CAAM job rings master ID for i.MX8MQ
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 5 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mq/include/platform_def.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index b18edd96d..99fa9807a 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -84,6 +84,11 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, mmio_write_32(IMX_CSU_BASE + i * 4, 0xffffffff); } + /* 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); + #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 4957582ad..5c5b0a5f9 100644 --- a/plat/imx/imx8m/imx8mq/include/platform_def.h +++ b/plat/imx/imx8m/imx8mq/include/platform_def.h @@ -119,3 +119,8 @@ #define DEBUG_CONSOLE 0 #define IMX_WDOG_B_RESET #define PLAT_IMX8M 1 + +#define CAAM_JR0MID U(0x30900010) +#define CAAM_JR1MID U(0x30900018) +#define CAAM_JR2MID U(0x30900020) +#define CAAM_NS_MID U(0x1) |