diff options
Diffstat (limited to 'arch/arm/mach-mmp/mmp-dt.c')
-rw-r--r-- | arch/arm/mach-mmp/mmp-dt.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c index 033cc31b3c72..d063efa0a4f1 100644 --- a/arch/arm/mach-mmp/mmp-dt.c +++ b/arch/arm/mach-mmp/mmp-dt.c | |||
@@ -22,10 +22,6 @@ | |||
22 | extern void __init mmp_dt_irq_init(void); | 22 | extern void __init mmp_dt_irq_init(void); |
23 | extern void __init mmp_dt_init_timer(void); | 23 | extern void __init mmp_dt_init_timer(void); |
24 | 24 | ||
25 | static struct sys_timer mmp_dt_timer = { | ||
26 | .init = mmp_dt_init_timer, | ||
27 | }; | ||
28 | |||
29 | static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = { | 25 | static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = { |
30 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL), | 26 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", NULL), |
31 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL), | 27 | OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", NULL), |
@@ -69,7 +65,7 @@ static const char *mmp_dt_board_compat[] __initdata = { | |||
69 | DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)") | 65 | DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)") |
70 | .map_io = mmp_map_io, | 66 | .map_io = mmp_map_io, |
71 | .init_irq = mmp_dt_irq_init, | 67 | .init_irq = mmp_dt_irq_init, |
72 | .timer = &mmp_dt_timer, | 68 | .init_time = mmp_dt_init_timer, |
73 | .init_machine = pxa168_dt_init, | 69 | .init_machine = pxa168_dt_init, |
74 | .dt_compat = mmp_dt_board_compat, | 70 | .dt_compat = mmp_dt_board_compat, |
75 | MACHINE_END | 71 | MACHINE_END |
@@ -77,7 +73,7 @@ MACHINE_END | |||
77 | DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)") | 73 | DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)") |
78 | .map_io = mmp_map_io, | 74 | .map_io = mmp_map_io, |
79 | .init_irq = mmp_dt_irq_init, | 75 | .init_irq = mmp_dt_irq_init, |
80 | .timer = &mmp_dt_timer, | 76 | .init_time = mmp_dt_init_timer, |
81 | .init_machine = pxa910_dt_init, | 77 | .init_machine = pxa910_dt_init, |
82 | .dt_compat = mmp_dt_board_compat, | 78 | .dt_compat = mmp_dt_board_compat, |
83 | MACHINE_END | 79 | MACHINE_END |