ARM: sunxi: Remove the .map_io function declaration

debug_ll_io_init should be enough to map the needed addresses at boot,
so remove the trivial map_io code, and let the core call
debug_ll_io_init.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 706ce35396b8d61f54bdab0e8e0f111f858a0477..d1b5bc537fbb67cbee401e433473ae000b85c289 100644 (file)
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -26,8 +26,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
@@ -81,20 +79,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_irq       = irqchip_init,
        .init_time      = sunxi_timer_init,
        .dt_compat      = sunxi_board_dt_compat,

diff --git a/arch/arm/mach-sunxi/sunxi.h b/arch/arm/mach-sunxi/sunxi.h
deleted file mode 100644 (file)
index 33b5871..0000000
--- a/arch/arm/mach-sunxi/sunxi.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Generic definitions for Allwinner SunXi SoCs
- *
- * Copyright (C) 2012 Maxime Ripard
- *
- * Maxime Ripard <maxime.ripard@free-electrons.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __MACH_SUNXI_H
-#define __MACH_SUNXI_H
-
-#define SUNXI_REGS_PHYS_BASE   0x01c00000
-#define SUNXI_REGS_VIRT_BASE   IOMEM(0xf1c00000)
-#define SUNXI_REGS_SIZE                (SZ_2M + SZ_1M)
-
-#endif /* __MACH_SUNXI_H */