ARM: i.MX: Remove i.MX1 non-DT support

[cascardo/linux.git] / arch / arm / mach-imx / imx1-dt.c

diff --git a/arch/arm/mach-imx/imx1-dt.c b/arch/arm/mach-imx/imx1-dt.c
index 6f915b0..de5ab8d 100644 (file)
--- a/arch/arm/mach-imx/imx1-dt.c
+++ b/arch/arm/mach-imx/imx1-dt.c
@@ -9,8 +9,27 @@
 
 #include <linux/of_platform.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/map.h>
 
 #include "common.h"
+#include "hardware.h"
+
+#define MX1_AVIC_ADDR  0x00223000
+
+static void __init imx1_init_early(void)
+{
+       mxc_set_cpu_type(MXC_CPU_MX1);
+}
+
+static void __init imx1_init_irq(void)
+{
+       void __iomem *avic_addr;
+
+       avic_addr = ioremap(MX1_AVIC_ADDR, SZ_4K);
+       WARN_ON(!avic_addr);
+
+       mxc_init_irq(avic_addr);
+}
 
 static const char * const imx1_dt_board_compat[] __initconst = {
        "fsl,imx1",
@@ -18,9 +37,9 @@ static const char * const imx1_dt_board_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)")
-       .map_io         = mx1_map_io,
+       .map_io         = debug_ll_io_init,
        .init_early     = imx1_init_early,
-       .init_irq       = mx1_init_irq,
+       .init_irq       = imx1_init_irq,
        .dt_compat      = imx1_dt_board_compat,
        .restart        = mxc_restart,
 MACHINE_END