diff options
Diffstat (limited to 'arch/arm/mach-imx/imx.c')
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c index 489cef6d86..f3491c6df7 100644 --- a/arch/arm/mach-imx/imx.c +++ b/arch/arm/mach-imx/imx.c @@ -4,9 +4,9 @@ #include <of.h> #include <init.h> #include <io.h> -#include <mach/revision.h> -#include <mach/generic.h> -#include <mach/reset-reason.h> +#include <mach/imx/revision.h> +#include <mach/imx/generic.h> +#include <mach/imx/reset-reason.h> static int __imx_silicon_revision = IMX_CHIP_REV_UNKNOWN; @@ -75,6 +75,8 @@ static int imx_soc_from_dt(void) return IMX_CPU_IMX8MN; if (of_machine_is_compatible("fsl,imx8mp")) return IMX_CPU_IMX8MP; + if (of_machine_is_compatible("fsl,imx93")) + return IMX_CPU_IMX93; if (of_machine_is_compatible("fsl,vf610")) return IMX_CPU_VF610; @@ -93,6 +95,10 @@ static int imx_init(void) return 0; } + /* + * Don't add new SoCs to this list, instead use the new + * soc framework (see soc-imx8m.c). + */ if (cpu_is_mx1()) ret = imx1_init(); else if (cpu_is_mx21()) @@ -116,13 +122,15 @@ static int imx_init(void) else if (cpu_is_mx7()) ret = imx7_init(); else if (cpu_is_mx8mm()) - ret = imx8mm_init(); + ret = 0; else if (cpu_is_mx8mn()) - ret = imx8mn_init(); + ret = 0; else if (cpu_is_mx8mp()) - ret = imx8mp_init(); + ret = 0; else if (cpu_is_mx8mq()) - ret = imx8mq_init(); + ret = 0; + else if (cpu_is_mx93()) + ret = imx93_init(); else if (cpu_is_vf610()) ret = vf610_init(); else |