diff options
Diffstat (limited to 'arch/arm/mach-sunxi/sunxi.c')
-rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 706ce35396b8..d1b5bc537fbb 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c | |||
@@ -26,8 +26,6 @@ | |||
26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
27 | #include <asm/system_misc.h> | 27 | #include <asm/system_misc.h> |
28 | 28 | ||
29 | #include "sunxi.h" | ||
30 | |||
31 | #define SUN4I_WATCHDOG_CTRL_REG 0x00 | 29 | #define SUN4I_WATCHDOG_CTRL_REG 0x00 |
32 | #define SUN4I_WATCHDOG_CTRL_RESTART (1 << 0) | 30 | #define SUN4I_WATCHDOG_CTRL_RESTART (1 << 0) |
33 | #define SUN4I_WATCHDOG_MODE_REG 0x04 | 31 | #define SUN4I_WATCHDOG_MODE_REG 0x04 |
@@ -81,20 +79,6 @@ static void sunxi_setup_restart(void) | |||
81 | arm_pm_restart = of_id->data; | 79 | arm_pm_restart = of_id->data; |
82 | } | 80 | } |
83 | 81 | ||
84 | static struct map_desc sunxi_io_desc[] __initdata = { | ||
85 | { | ||
86 | .virtual = (unsigned long) SUNXI_REGS_VIRT_BASE, | ||
87 | .pfn = __phys_to_pfn(SUNXI_REGS_PHYS_BASE), | ||
88 | .length = SUNXI_REGS_SIZE, | ||
89 | .type = MT_DEVICE, | ||
90 | }, | ||
91 | }; | ||
92 | |||
93 | void __init sunxi_map_io(void) | ||
94 | { | ||
95 | iotable_init(sunxi_io_desc, ARRAY_SIZE(sunxi_io_desc)); | ||
96 | } | ||
97 | |||
98 | static void __init sunxi_timer_init(void) | 82 | static void __init sunxi_timer_init(void) |
99 | { | 83 | { |
100 | sunxi_init_clocks(); | 84 | sunxi_init_clocks(); |
@@ -116,7 +100,6 @@ static const char * const sunxi_board_dt_compat[] = { | |||
116 | 100 | ||
117 | DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") | 101 | DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") |
118 | .init_machine = sunxi_dt_init, | 102 | .init_machine = sunxi_dt_init, |
119 | .map_io = sunxi_map_io, | ||
120 | .init_irq = irqchip_init, | 103 | .init_irq = irqchip_init, |
121 | .init_time = sunxi_timer_init, | 104 | .init_time = sunxi_timer_init, |
122 | .dt_compat = sunxi_board_dt_compat, | 105 | .dt_compat = sunxi_board_dt_compat, |