diff options
Diffstat (limited to 'arch/arm/mach-imx/imx31-dt.c')
-rw-r--r-- | arch/arm/mach-imx/imx31-dt.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c index af476de2570e..b5c04eece780 100644 --- a/arch/arm/mach-imx/imx31-dt.c +++ b/arch/arm/mach-imx/imx31-dt.c | |||
@@ -38,26 +38,22 @@ static void __init imx31_dt_init(void) | |||
38 | imx31_auxdata_lookup, NULL); | 38 | imx31_auxdata_lookup, NULL); |
39 | } | 39 | } |
40 | 40 | ||
41 | static void __init imx31_timer_init(void) | ||
42 | { | ||
43 | mx31_clocks_init_dt(); | ||
44 | } | ||
45 | |||
46 | static struct sys_timer imx31_timer = { | ||
47 | .init = imx31_timer_init, | ||
48 | }; | ||
49 | |||
50 | static const char *imx31_dt_board_compat[] __initdata = { | 41 | static const char *imx31_dt_board_compat[] __initdata = { |
51 | "fsl,imx31", | 42 | "fsl,imx31", |
52 | NULL | 43 | NULL |
53 | }; | 44 | }; |
54 | 45 | ||
46 | static void __init imx31_dt_timer_init(void) | ||
47 | { | ||
48 | mx31_clocks_init_dt(); | ||
49 | } | ||
50 | |||
55 | DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)") | 51 | DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)") |
56 | .map_io = mx31_map_io, | 52 | .map_io = mx31_map_io, |
57 | .init_early = imx31_init_early, | 53 | .init_early = imx31_init_early, |
58 | .init_irq = mx31_init_irq, | 54 | .init_irq = mx31_init_irq, |
59 | .handle_irq = imx31_handle_irq, | 55 | .handle_irq = imx31_handle_irq, |
60 | .timer = &imx31_timer, | 56 | .init_time = imx31_dt_timer_init, |
61 | .init_machine = imx31_dt_init, | 57 | .init_machine = imx31_dt_init, |
62 | .dt_compat = imx31_dt_board_compat, | 58 | .dt_compat = imx31_dt_board_compat, |
63 | .restart = mxc_restart, | 59 | .restart = mxc_restart, |