From: Peng Fan Date: Mon, 16 Sep 2019 03:09:20 +0000 (+0000) Subject: imx8mn: set BYPASS ID SWAP to avoid AXI bus errors X-Git-Tag: v2020.01-rc3~7^2~20 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=deca6cfbf5d7f52d4a86e24afc1a808ec673ddcf;p=oweals%2Fu-boot.git imx8mn: set BYPASS ID SWAP to avoid AXI bus errors Set the BYPASS ID SWAP bit (GPR10 bit 1) in order for GPU not to generated AXI bus errors with TZC380 enabled. Signed-off-by: Peng Fan --- diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 82fa7aea13..e2c1c1315f 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -56,7 +56,7 @@ 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); - if (IS_ENABLED(CONFIG_IMX8MM)) + if (is_imx8mm() || is_imx8mn()) setbits_le32(&gpr->gpr[10], BIT(1)); /* * set Region 0 attribute to allow secure and non-secure