aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/imx25-dt.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-imx/imx25-dt.c')
-rw-r--r--arch/arm/mach-imx/imx25-dt.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/imx25-dt.c
index e17dfbc4219..42a65e06744 100644
--- a/arch/arm/mach-imx/imx25-dt.c
+++ b/arch/arm/mach-imx/imx25-dt.c
@@ -19,29 +19,26 @@
static void __init imx25_dt_init(void)
{
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
+ mxc_arch_reset_init_dt();
-static void __init imx25_timer_init(void)
-{
- mx25_clocks_init_dt();
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
-static struct sys_timer imx25_timer = {
- .init = imx25_timer_init,
-};
-
static const char * const imx25_dt_board_compat[] __initconst = {
"fsl,imx25",
NULL
};
+static void __init imx25_timer_init(void)
+{
+ mx25_clocks_init_dt();
+}
+
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,
- .handle_irq = imx25_handle_irq,
- .timer = &imx25_timer,
+ .init_time = imx25_timer_init,
.init_machine = imx25_dt_init,
.dt_compat = imx25_dt_board_compat,
.restart = mxc_restart,