LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MA-13964 imx8q: Kick the CAAM JR before kicking the SMMU 

Kick the CAAM JR3 before kicking the SMMU, so SMMU error
won't affect CAAM functions.

Test: build and boot on imx8qxp_mek.

Change-Id: Iaa9a6084f226f81a087aac1eced93e8785861113
Signed-off-by: Ji Luo <ji.luo@nxp.com>
This commit is contained in:
Ji Luo 2019-01-18 18:30:29 +08:00
parent a6792ed6e5
commit a5ab0289c7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-imx/imx8/cpu.c
View File

@ -185,6 +185,14 @@ int arch_cpu_init(void)
gd->arch.ipc_channel_handle = ipcHndl; gd->arch.ipc_channel_handle = ipcHndl;
/* Dual bootloader feature will require CAAM access, but JR0 and JR1 will be
* assigned to seco for imx8, use JR3 instead.
*/
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_DUAL_BOOTLOADER)
sc_pm_set_resource_power_mode(ipcHndl, SC_R_CAAM_JR3, SC_PM_PW_MODE_ON);
sc_pm_set_resource_power_mode(ipcHndl, SC_R_CAAM_JR3_OUT, SC_PM_PW_MODE_ON);
#endif
if (IS_ENABLED(CONFIG_XEN)) if (IS_ENABLED(CONFIG_XEN))
return 0; return 0;
@ -203,14 +211,6 @@ int arch_cpu_init(void)
return 0; return 0;
#endif #endif
/* Dual bootloader feature will require CAAM access, but JR0 and JR1 will be
* assigned to seco for imx8, use JR3 instead.
*/
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_DUAL_BOOTLOADER)
sc_pm_set_resource_power_mode(ipcHndl, SC_R_CAAM_JR3, SC_PM_PW_MODE_ON);
sc_pm_set_resource_power_mode(ipcHndl, SC_R_CAAM_JR3_OUT, SC_PM_PW_MODE_ON);
#endif
return 0; return 0;
} }