Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[pandora-kernel.git] / arch / sh / boards / mach-rsk / devices-rsk7203.c

diff --git a/arch/sh/boards/mach-rsk/devices-rsk7203.c b/arch/sh/boards/mach-rsk/devices-rsk7203.c
index c37617e..a8089f7 100644 (file)
--- a/arch/sh/boards/mach-rsk/devices-rsk7203.c
+++ b/arch/sh/boards/mach-rsk/devices-rsk7203.c
@@ -1,7 +1,7 @@
 /*
  * Renesas Technology Europe RSK+ 7203 Support.
  *
- * Copyright (C) 2008 Paul Mundt
+ * Copyright (C) 2008 - 2010  Paul Mundt
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -12,7 +12,9 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/smsc911x.h>
+#include <linux/input.h>
 #include <linux/gpio.h>
+#include <linux/gpio_keys.h>
 #include <linux/leds.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
@@ -84,9 +86,42 @@ static struct platform_device led_device = {
        },
 };
 
+static struct gpio_keys_button rsk7203_gpio_keys_table[] = {
+       {
+               .code           = BTN_0,
+               .gpio           = GPIO_PB0,
+               .active_low     = 1,
+               .desc           = "SW1",
+       }, {
+               .code           = BTN_1,
+               .gpio           = GPIO_PB1,
+               .active_low     = 1,
+               .desc           = "SW2",
+       }, {
+               .code           = BTN_2,
+               .gpio           = GPIO_PB2,
+               .active_low     = 1,
+               .desc           = "SW3",
+       },
+};
+
+static struct gpio_keys_platform_data rsk7203_gpio_keys_info = {
+       .buttons        = rsk7203_gpio_keys_table,
+       .nbuttons       = ARRAY_SIZE(rsk7203_gpio_keys_table),
+       .poll_interval  = 50, /* default to 50ms */
+};
+
+static struct platform_device keys_device = {
+       .name           = "gpio-keys-polled",
+       .dev            = {
+               .platform_data  = &rsk7203_gpio_keys_info,
+       },
+};
+
 static struct platform_device *rsk7203_devices[] __initdata = {
        &smsc911x_device,
        &led_device,
+       &keys_device,
 };
 
 static int __init rsk7203_devices_setup(void)
@@ -96,7 +131,7 @@ static int __init rsk7203_devices_setup(void)
        gpio_request(GPIO_FN_RXD0, NULL);
 
        /* Setup LAN9118: CS1 in 16-bit Big Endian Mode, IRQ0 at Port B */
-       ctrl_outl(0x36db0400, 0xfffc0008); /* CS1BCR */
+       __raw_writel(0x36db0400, 0xfffc0008); /* CS1BCR */
        gpio_request(GPIO_FN_IRQ0_PB, NULL);
 
        return platform_add_devices(rsk7203_devices,