linux-mips
[Top] [All Lists]

[PATCH 1/2] MIPS: rb532: prepare board support for rb532-button

To: Dmitry Torokhov <dtor@mail.ru>
Subject: [PATCH 1/2] MIPS: rb532: prepare board support for rb532-button
From: Phil Sutter <n0-1@freewrt.org>
Date: Thu, 22 Jan 2009 20:12:07 +0100
Cc: linux-input@vger.kernel.org, Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org, Florian Fainelli <florian@openwrt.org>
In-reply-to: <1232651528-19870-1-git-send-email-n0-1@freewrt.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1232651528-19870-1-git-send-email-n0-1@freewrt.org>
Sender: linux-mips-bounce@linux-mips.org
Add a macro containing the S1 button GPIO pin index, as done for NAND
and CompactFlash GPIO pins. Also remove gpio-keys specific device code
and rename the button device to mach it's driver.

Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
 arch/mips/include/asm/mach-rc32434/gpio.h |    3 +++
 arch/mips/rb532/devices.c                 |   19 +------------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/arch/mips/include/asm/mach-rc32434/gpio.h 
b/arch/mips/include/asm/mach-rc32434/gpio.h
index 3cb50d1..12ee8d5 100644
--- a/arch/mips/include/asm/mach-rc32434/gpio.h
+++ b/arch/mips/include/asm/mach-rc32434/gpio.h
@@ -80,6 +80,9 @@ struct rb532_gpio_reg {
 /* Compact Flash GPIO pin */
 #define CF_GPIO_NUM            13
 
+/* S1 button GPIO (shared with UART0_SIN) */
+#define GPIO_BTN_S1            1
+
 extern void rb532_gpio_set_ilevel(int bit, unsigned gpio);
 extern void rb532_gpio_set_istat(int bit, unsigned gpio);
 extern void rb532_gpio_set_func(unsigned gpio);
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 4a5f05b..7b585de 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -200,26 +200,9 @@ static struct platform_device rb532_led = {
        .id = -1,
 };
 
-static struct gpio_keys_button rb532_gpio_btn[] = {
-       {
-               .gpio = 1,
-               .code = BTN_0,
-               .desc = "S1",
-               .active_low = 1,
-       }
-};
-
-static struct gpio_keys_platform_data rb532_gpio_btn_data = {
-       .buttons = rb532_gpio_btn,
-       .nbuttons = ARRAY_SIZE(rb532_gpio_btn),
-};
-
 static struct platform_device rb532_button = {
-       .name   = "gpio-keys",
+       .name   = "rb532-button",
        .id     = -1,
-       .dev    = {
-               .platform_data = &rb532_gpio_btn_data,
-       }
 };
 
 static struct resource rb532_wdt_res[] = {
-- 
1.5.6.4


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 1/2] MIPS: rb532: prepare board support for rb532-button, Phil Sutter <=