MLK-21889-2 imx8mn: Add runtime soc type check

Add is_imx8mn for runtime soc type checking, and update drivers to use it.

Signed-off-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit e8ec22ef74a9d98e621fe1ac6418b06d5586ab12)

diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h
index 4dbad53..9c3d09e 100644 (file)
--- a/arch/arm/include/asm/mach-imx/sys_proto.h
+++ b/arch/arm/include/asm/mach-imx/sys_proto.h
@@ -54,6 +54,7 @@
 #define is_imx8mmdl() (is_cpu_type(MXC_CPU_IMX8MMDL))
 #define is_imx8mms() (is_cpu_type(MXC_CPU_IMX8MMS))
 #define is_imx8mmsl() (is_cpu_type(MXC_CPU_IMX8MMSL))
+#define is_imx8mn() (is_cpu_type(MXC_CPU_IMX8MN))
 #define is_imx8qm() (is_cpu_type(MXC_CPU_IMX8QM))
 #define is_imx8qxp() (is_cpu_type(MXC_CPU_IMX8QXP))
 

diff --git a/drivers/fastboot/fb_fsl/fb_fsl_common.c b/drivers/fastboot/fb_fsl/fb_fsl_common.c
index d88a042..ceac6b6 100755 (executable)
--- a/drivers/fastboot/fb_fsl/fb_fsl_common.c
+++ b/drivers/fastboot/fb_fsl/fb_fsl_common.c
@@ -188,6 +188,9 @@ void board_fastboot_setup(void)
        } else if (is_imx8mm()) {
                if (!env_get("soc_type"))
                        env_set("soc_type", "imx8mm");
+       } else if (is_imx8mn()) {
+               if (!env_get("soc_type"))
+                       env_set("soc_type", "imx8mn");
        }
 }
 

diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 8b716f6..17ce5eb 100644 (file)
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -616,7 +616,7 @@ static int ehci_usb_phy_mode(struct udevice *dev)
                        priv->init_type = USB_INIT_DEVICE;
                else
                        priv->init_type = USB_INIT_HOST;
-       } else if (is_mx7() || is_imx8mm()) {
+       } else if (is_mx7() || is_imx8mm() || is_imx8mn()) {
                phy_status = (void __iomem *)(priv->phy_base +
                                              USBNC_PHY_STATUS_OFFSET);
                val = readl(phy_status);
@@ -667,7 +667,7 @@ static int ehci_get_usb_phy(struct udevice *dev)
                }
 #endif
                priv->phy_base = addr;
-       } else if (is_mx7() || is_imx8mm()) {
+       } else if (is_mx7() || is_imx8mm() || is_imx8mn()) {
                priv->phy_base = addr;
        } else {
                return -EINVAL;