From: Peng Fan <peng....@nxp.com>

All i.MX8M needs TZASC ID SWAP set and locked, no need the check to
waste cpu cycles.

Signed-off-by: Peng Fan <peng....@nxp.com>
---
 arch/arm/mach-imx/imx8m/soc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 8e23e6da326..5240dc11363 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -72,15 +72,13 @@ void enable_tzc380(void)
         * According to TRM, TZASC_ID_SWAP_BYPASS should be set in
         * order to avoid AXI Bus errors when GPU is in use
         */
-       if (is_imx8mq() || is_imx8mm() || is_imx8mn() || is_imx8mp())
-               setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS);
+       setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS);
 
        /*
         * imx8mn and imx8mp implements the lock bit for
         * TZASC_ID_SWAP_BYPASS, enable it to lock settings
         */
-       if (is_imx8mn() || is_imx8mp())
-               setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS_LOCK);
+       setbits_le32(&gpr->gpr[10], GPR_TZASC_ID_SWAP_BYPASS_LOCK);
 
        /*
         * set Region 0 attribute to allow secure and non-secure
-- 
2.36.0

Reply via email to