summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/imx1-dt.c
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2016-08-06 07:56:25 +0300
committerShawn Guo <shawnguo@kernel.org>2016-08-09 22:47:26 +0800
commite1291cffcc509e790f46f1af6fec13eb8d44d5bb (patch)
tree13d12223291c14d0758223ddedc60cd72d48e50d /arch/arm/mach-imx/imx1-dt.c
parentde2d6662ece073b1b02e94678f77c47646920f17 (diff)
downloadlwn-e1291cffcc509e790f46f1af6fec13eb8d44d5bb.tar.gz
lwn-e1291cffcc509e790f46f1af6fec13eb8d44d5bb.zip
ARM: i.MX: Remove i.MX1 non-DT support
This patch removes registration helpers and support files, used for non-DT i.MX1 targets. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/imx1-dt.c')
-rw-r--r--arch/arm/mach-imx/imx1-dt.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx1-dt.c b/arch/arm/mach-imx/imx1-dt.c
index 6f915b0961c4..de5ab8d88549 100644
--- 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