Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[linux-2.6-block.git] / arch / arm / mach-shmobile / board-marzen.c

diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 3b2e88ae26be9ed84ca9fd0501a8b7c4eeb7ba69..ef0e13bf0b3a46911564e1ef7515740a77028574 100644 (file)
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -34,8 +34,6 @@
 #include <mach/irqs.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/time.h>
 #include <asm/hardware/gic.h>
 #include <asm/traps.h>
 
@@ -73,49 +71,6 @@ static struct platform_device *marzen_devices[] __initdata = {
        &eth_device,
 };
 
-static struct map_desc marzen_io_desc[] __initdata = {
-       /* 2M entity map for 0xf0000000 (MPCORE) */
-       {
-               .virtual        = 0xf0000000,
-               .pfn            = __phys_to_pfn(0xf0000000),
-               .length         = SZ_2M,
-               .type           = MT_DEVICE_NONSHARED
-       },
-       /* 16M entity map for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */
-       {
-               .virtual        = 0xfe000000,
-               .pfn            = __phys_to_pfn(0xfe000000),
-               .length         = SZ_16M,
-               .type           = MT_DEVICE_NONSHARED
-       },
-};
-
-static void __init marzen_map_io(void)
-{
-       iotable_init(marzen_io_desc, ARRAY_SIZE(marzen_io_desc));
-}
-
-static void __init marzen_init_early(void)
-{
-       r8a7779_add_early_devices();
-
-       /* Early serial console setup is not included here due to
-        * memory map collisions. The SCIF serial ports in r8a7779
-        * are difficult to entity map 1:1 due to collision with the
-        * virtual memory range used by the coherent DMA code on ARM.
-        *
-        * Anyone wanting to debug early can remove UPF_IOREMAP from
-        * the sh-sci serial console platform data, adjust mapbase
-        * to a static M:N virt:phys mapping that needs to be added to
-        * the mappings passed with iotable_init() above.
-        *
-        * Then add a call to shmobile_setup_console() from this function.
-        *
-        * As a final step pass earlyprint=sh-sci.2,115200 on the kernel
-        * command line.
-        */
-}
-
 static void __init marzen_init(void)
 {
        r8a7779_pinmux_init();
@@ -136,23 +91,12 @@ static void __init marzen_init(void)
        platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-static void __init marzen_timer_init(void)
-{
-       r8a7779_clock_init();
-       shmobile_timer.init();
-       return;
-}
-
-struct sys_timer marzen_timer = {
-       .init   = marzen_timer_init,
-};
-
 MACHINE_START(MARZEN, "marzen")
-       .map_io         = marzen_map_io,
-       .init_early     = marzen_init_early,
+       .map_io         = r8a7779_map_io,
+       .init_early     = r8a7779_add_early_devices,
        .nr_irqs        = NR_IRQS_LEGACY,
        .init_irq       = r8a7779_init_irq,
        .handle_irq     = gic_handle_irq,
        .init_machine   = marzen_init,
-       .timer          = &marzen_timer,
+       .timer          = &shmobile_timer,
 MACHINE_END