Merge branch 's3c-move' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-at91 / board-sam9261ek.c

diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index 43dfbd0d543a07c7aeb7689354e3ea506bff60b1..4977409d4fc6bcb72e3f17fa8a5646526040b9e5 100644 (file)
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -35,7 +35,6 @@
 
 #include <video/atmel_lcdc.h>
 
-#include <asm/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
@@ -44,9 +43,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <asm/arch/board.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/at91sam9_smc.h>
+#include <mach/hardware.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/at91sam9_smc.h>
 
 #include "generic.h"
 
@@ -168,11 +168,11 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
        {
                .name   = "Partition 1",
                .offset = 0,
-               .size   = 256 * 1024,
+               .size   = SZ_256K,
        },
        {
                .name   = "Partition 2",
-               .offset = 256 * 1024 ,
+               .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
 };
@@ -190,7 +190,7 @@ static struct atmel_nand_data __initdata ek_nand_data = {
        .rdy_pin        = AT91_PIN_PC15,
        .enable_pin     = AT91_PIN_PC14,
        .partition_info = nand_partitions,
-#if defined(CONFIG_MTD_NAND_AT91_BUSWIDTH_16)
+#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
        .bus_width_16   = 1,
 #else
        .bus_width_16   = 0,
@@ -435,24 +435,28 @@ static struct gpio_keys_button ek_buttons[] = {
                .code           = BTN_0,
                .desc           = "Button 0",
                .active_low     = 1,
+               .wakeup         = 1,
        },
        {
                .gpio           = AT91_PIN_PA26,
                .code           = BTN_1,
                .desc           = "Button 1",
                .active_low     = 1,
+               .wakeup         = 1,
        },
        {
                .gpio           = AT91_PIN_PA25,
                .code           = BTN_2,
                .desc           = "Button 2",
                .active_low     = 1,
+               .wakeup         = 1,
        },
        {
                .gpio           = AT91_PIN_PA24,
                .code           = BTN_3,
                .desc           = "Button 3",
                .active_low     = 1,
+               .wakeup         = 1,
        }
 };
 
@@ -472,13 +476,13 @@ static struct platform_device ek_button_device = {
 
 static void __init ek_add_device_buttons(void)
 {
-       at91_set_gpio_input(AT91_PIN_PA27, 0);  /* btn0 */
+       at91_set_gpio_input(AT91_PIN_PA27, 1);  /* btn0 */
        at91_set_deglitch(AT91_PIN_PA27, 1);
-       at91_set_gpio_input(AT91_PIN_PA26, 0);  /* btn1 */
+       at91_set_gpio_input(AT91_PIN_PA26, 1);  /* btn1 */
        at91_set_deglitch(AT91_PIN_PA26, 1);
-       at91_set_gpio_input(AT91_PIN_PA25, 0);  /* btn2 */
+       at91_set_gpio_input(AT91_PIN_PA25, 1);  /* btn2 */
        at91_set_deglitch(AT91_PIN_PA25, 1);
-       at91_set_gpio_input(AT91_PIN_PA24, 0);  /* btn3 */
+       at91_set_gpio_input(AT91_PIN_PA24, 1);  /* btn3 */
        at91_set_deglitch(AT91_PIN_PA24, 1);
 
        platform_device_register(&ek_button_device);