diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-03-13 13:31:55 (GMT) |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2015-03-13 14:14:57 (GMT) |
commit | 6869a22fcf10ba9e32ad9a6301ee3fe326625fd6 (patch) | |
tree | e6069d3a0e43cfac28728124edc63e3a07715785 /arch/arm/mach-imx/mach-imx25.c | |
parent | 8b88f7ef31ddecd943e3312d6b61e1b1c6eab3d0 (diff) | |
download | linux-6869a22fcf10ba9e32ad9a6301ee3fe326625fd6.tar.xz |
ARM: mx25: Remove static memory mapping
We use dynamic memory mapping when using dt, so remove all the static mappings.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx25.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx25.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-imx25.c b/arch/arm/mach-imx/mach-imx25.c index 25defbd..9379fd0 100644 --- a/arch/arm/mach-imx/mach-imx25.c +++ b/arch/arm/mach-imx/mach-imx25.c @@ -10,12 +10,29 @@ */ #include <linux/irq.h> +#include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include "common.h" -#include "mx25.h" +#include "hardware.h" + +static void __init imx25_init_early(void) +{ + mxc_set_cpu_type(MXC_CPU_MX25); +} + +static void __init mx25_init_irq(void) +{ + struct device_node *np; + void __iomem *avic_base; + + np = of_find_compatible_node(NULL, NULL, "fsl,avic"); + avic_base = of_iomap(np, 0); + BUG_ON(!avic_base); + mxc_init_irq(avic_base); +} static const char * const imx25_dt_board_compat[] __initconst = { "fsl,imx25", @@ -23,7 +40,6 @@ static const char * const imx25_dt_board_compat[] __initconst = { }; DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)") - .map_io = mx25_map_io, .init_early = imx25_init_early, .init_irq = mx25_init_irq, .dt_compat = imx25_dt_board_compat, |