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

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

diff --git a/arch/arm/mach-shmobile/board-kota2.c b/arch/arm/mach-shmobile/board-kota2.c
index c71780b..10e9e69 100644 (file)
--- a/arch/arm/mach-shmobile/board-kota2.c
+++ b/arch/arm/mach-shmobile/board-kota2.c
@@ -44,7 +44,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>
 #include <asm/hardware/gic.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -144,11 +143,10 @@ static struct gpio_keys_button gpio_buttons[] = {
 static struct gpio_keys_platform_data gpio_key_info = {
        .buttons        = gpio_buttons,
        .nbuttons       = ARRAY_SIZE(gpio_buttons),
-       .poll_interval  = 250, /* polled for now */
 };
 
 static struct platform_device gpio_keys_device = {
-       .name   = "gpio-keys-polled", /* polled for now */
+       .name   = "gpio-keys",
        .id     = -1,
        .dev    = {
                .platform_data  = &gpio_key_info,
@@ -411,27 +409,6 @@ static struct platform_device *kota2_devices[] __initdata = {
        &sdhi1_device,
 };
 
-static struct map_desc kota2_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 kota2_map_io(void)
-{
-       iotable_init(kota2_io_desc, ARRAY_SIZE(kota2_io_desc));
-
-       /* setup early devices and console here as well */
-       sh73a0_add_early_devices();
-       shmobile_setup_console();
-}
-
 static void __init kota2_init(void)
 {
        sh73a0_pinmux_init();
@@ -537,22 +514,12 @@ static void __init kota2_init(void)
        platform_add_devices(kota2_devices, ARRAY_SIZE(kota2_devices));
 }
 
-static void __init kota2_timer_init(void)
-{
-       sh73a0_clock_init();
-       shmobile_timer.init();
-       return;
-}
-
-struct sys_timer kota2_timer = {
-       .init   = kota2_timer_init,
-};
-
 MACHINE_START(KOTA2, "kota2")
-       .map_io         = kota2_map_io,
+       .map_io         = sh73a0_map_io,
+       .init_early     = sh73a0_add_early_devices,
        .nr_irqs        = NR_IRQS_LEGACY,
        .init_irq       = sh73a0_init_irq,
        .handle_irq     = gic_handle_irq,
        .init_machine   = kota2_init,
-       .timer          = &kota2_timer,
+       .timer          = &shmobile_timer,
 MACHINE_END