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

[linux-flexiantxendom0-3.2.10.git] / arch / arm / mach-shmobile / board-g4evm.c

diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c
index 2936ccc..0e5a39c 100644 (file)
--- a/arch/arm/mach-shmobile/board-g4evm.c
+++ b/arch/arm/mach-shmobile/board-g4evm.c
@@ -39,8 +39,6 @@
 #include <mach/common.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/time.h>
 
 /*
  * SDHI
@@ -261,27 +259,6 @@ static struct platform_device *g4evm_devices[] __initdata = {
        &sdhi1_device,
 };
 
-static struct map_desc g4evm_io_desc[] __initdata = {
-       /* create a 1:1 entity map for 0xe6xxxxxx
-        * used by CPGA, INTC and PFC.
-        */
-       {
-               .virtual        = 0xe6000000,
-               .pfn            = __phys_to_pfn(0xe6000000),
-               .length         = 256 << 20,
-               .type           = MT_DEVICE_NONSHARED
-       },
-};
-
-static void __init g4evm_map_io(void)
-{
-       iotable_init(g4evm_io_desc, ARRAY_SIZE(g4evm_io_desc));
-
-       /* setup early devices and console here as well */
-       sh7377_add_early_devices();
-       shmobile_setup_console();
-}
-
 #define GPIO_SDHID0_D0 0xe60520fc
 #define GPIO_SDHID0_D1 0xe60520fd
 #define GPIO_SDHID0_D2 0xe60520fe
@@ -398,20 +375,11 @@ static void __init g4evm_init(void)
        platform_add_devices(g4evm_devices, ARRAY_SIZE(g4evm_devices));
 }
 
-static void __init g4evm_timer_init(void)
-{
-       sh7377_clock_init();
-       shmobile_timer.init();
-}
-
-static struct sys_timer g4evm_timer = {
-       .init           = g4evm_timer_init,
-};
-
 MACHINE_START(G4EVM, "g4evm")
-       .map_io         = g4evm_map_io,
+       .map_io         = sh7377_map_io,
+       .init_early     = sh7377_add_early_devices,
        .init_irq       = sh7377_init_irq,
        .handle_irq     = shmobile_handle_irq_intc,
        .init_machine   = g4evm_init,
-       .timer          = &g4evm_timer,
+       .timer          = &shmobile_timer,
 MACHINE_END