Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / mach-sunxi / sunxi.c

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index a42d8743ba7f7c5088b8f5ec67fd7676fa71c80d..84485a10fc3a6aea5437aba8d039c1a67c7a1d5f 100644 (file)
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -25,8 +25,6 @@
 #include <asm/mach/map.h>
 #include <asm/system_misc.h>
 
-#include "sunxi.h"
-
 #define SUN4I_WATCHDOG_CTRL_REG                0x00
 #define SUN4I_WATCHDOG_CTRL_RESTART            (1 << 0)
 #define SUN4I_WATCHDOG_MODE_REG                0x04
@@ -80,20 +78,6 @@ static void sunxi_setup_restart(void)
        arm_pm_restart = of_id->data;
 }
 
-static struct map_desc sunxi_io_desc[] __initdata = {
-       {
-               .virtual        = (unsigned long) SUNXI_REGS_VIRT_BASE,
-               .pfn            = __phys_to_pfn(SUNXI_REGS_PHYS_BASE),
-               .length         = SUNXI_REGS_SIZE,
-               .type           = MT_DEVICE,
-       },
-};
-
-void __init sunxi_map_io(void)
-{
-       iotable_init(sunxi_io_desc, ARRAY_SIZE(sunxi_io_desc));
-}
-
 static void __init sunxi_timer_init(void)
 {
        sunxi_init_clocks();
@@ -116,7 +100,6 @@ static const char * const sunxi_board_dt_compat[] = {
 
 DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
        .init_machine   = sunxi_dt_init,
-       .map_io         = sunxi_map_io,
        .init_time      = sunxi_timer_init,
        .dt_compat      = sunxi_board_dt_compat,
 MACHINE_END