From: Peng Fan <peng.fan@nxp.com>
Date: Tue, 27 Aug 2019 06:25:30 +0000 (+0000)
Subject: imx8m: set BYPASS ID SWAP to avoid AXI bus errors
X-Git-Tag: v2020.01-rc1~33^2~48
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dbb2b7e50899ea6651bdc4c931427e6152493ba2;p=oweals%2Fu-boot.git

imx8m: 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 <peng.fan@nxp.com>
---

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index dd393b581b..261f586fc0 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -55,6 +55,8 @@ 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))
+		setbits_le32(&gpr->gpr[10], BIT(1));
 }
 
 void set_wdog_reset(struct wdog_regs *wdog)