diff options
Diffstat (limited to 'arch/arm/mach-mmp/mmp2-dt.c')
-rw-r--r-- | arch/arm/mach-mmp/mmp2-dt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c index 535a5ed5977b..fad431aa6e09 100644 --- a/arch/arm/mach-mmp/mmp2-dt.c +++ b/arch/arm/mach-mmp/mmp2-dt.c | |||
@@ -24,10 +24,6 @@ | |||
24 | extern void __init mmp_dt_irq_init(void); | 24 | extern void __init mmp_dt_irq_init(void); |
25 | extern void __init mmp_dt_init_timer(void); | 25 | extern void __init mmp_dt_init_timer(void); |
26 | 26 | ||
27 | static struct sys_timer mmp_dt_timer = { | ||
28 | .init = mmp_dt_init_timer, | ||
29 | }; | ||
30 | |||
31 | static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = { | 27 | static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = { |
32 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4030000, "pxa2xx-uart.0", NULL), | 28 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4030000, "pxa2xx-uart.0", NULL), |
33 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.1", NULL), | 29 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.1", NULL), |
@@ -54,7 +50,7 @@ static const char *mmp2_dt_board_compat[] __initdata = { | |||
54 | DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)") | 50 | DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)") |
55 | .map_io = mmp_map_io, | 51 | .map_io = mmp_map_io, |
56 | .init_irq = mmp_dt_irq_init, | 52 | .init_irq = mmp_dt_irq_init, |
57 | .timer = &mmp_dt_timer, | 53 | .init_time = mmp_dt_init_timer, |
58 | .init_machine = mmp2_dt_init, | 54 | .init_machine = mmp2_dt_init, |
59 | .dt_compat = mmp2_dt_board_compat, | 55 | .dt_compat = mmp2_dt_board_compat, |
60 | MACHINE_END | 56 | MACHINE_END |