Merge tag 'for-v2019.01' of git://git.denx.de/u-boot-video

[platform/kernel/u-boot.git] / arch / arm / mach-imx / imx_bootaux.c

diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c
index 0272851..18d7e68 100644 (file)
--- a/arch/arm/mach-imx/imx_bootaux.c
+++ b/arch/arm/mach-imx/imx_bootaux.c
@@ -1,12 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/mach-imx/sys_proto.h>
 #include <command.h>
+#include <imx_sip.h>
 #include <linux/compiler.h>
 
 int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
@@ -16,22 +17,29 @@ int arch_auxiliary_core_up(u32 core_id, ulong boot_private_data)
        if (!boot_private_data)
                return -EINVAL;
 
-       stack = *(ulong *)boot_private_data;
-       pc = *(ulong *)(boot_private_data + 4);
+       stack = *(u32 *)boot_private_data;
+       pc = *(u32 *)(boot_private_data + 4);
 
        /* Set the stack and pc to M4 bootROM */
        writel(stack, M4_BOOTROM_BASE_ADDR);
        writel(pc, M4_BOOTROM_BASE_ADDR + 4);
 
        /* Enable M4 */
+#ifdef CONFIG_IMX8M
+       call_imx_sip(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0);
+#else
        clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET,
                        SRC_M4C_NON_SCLR_RST_MASK, SRC_M4_ENABLE_MASK);
+#endif
 
        return 0;
 }
 
 int arch_auxiliary_core_check_up(u32 core_id)
 {
+#ifdef CONFIG_IMX8M
+       return call_imx_sip(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0);
+#else
        unsigned int val;
 
        val = readl(SRC_BASE_ADDR + SRC_M4_REG_OFFSET);
@@ -40,6 +48,7 @@ int arch_auxiliary_core_check_up(u32 core_id)
                return 0;  /* assert in reset */
 
        return 1;
+#endif
 }
 
 /*