ARM: shmobile: emev2: Remove legacy machine_desc.map_io() callback
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 28 Jan 2016 15:17:26 +0000 (16:17 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 19 Feb 2016 05:45:30 +0000 (14:45 +0900)
Commit FIXME ("ARM: shmobile: Consolidate SCU mapping code") removed the
last user of the static mapping on emev2-based systems.  Remove the
mapping and the legacy machine_desc.map_io() callback.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/setup-emev2.c

index 10b7cb5..0829d02 100644 (file)
 #include <asm/mach/map.h>
 #include "common.h"
 
-static struct map_desc emev2_io_desc[] __initdata = {
-#ifdef CONFIG_SMP
-       /* 2M mapping for SCU + L2 controller */
-       {
-               .virtual        = 0xf0000000,
-               .pfn            = __phys_to_pfn(0x1e000000),
-               .length         = SZ_2M,
-               .type           = MT_DEVICE
-       },
-#endif
-};
-
-static void __init emev2_map_io(void)
-{
-       iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
-}
-
 static const char *const emev2_boards_compat_dt[] __initconst = {
        "renesas,emev2",
        NULL,
@@ -46,7 +29,6 @@ extern const struct smp_operations emev2_smp_ops;
 
 DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
        .smp            = smp_ops(emev2_smp_ops),
-       .map_io         = emev2_map_io,
        .init_early     = shmobile_init_delay,
        .init_late      = shmobile_init_late,
        .dt_compat      = emev2_boards_compat_dt,