From 184e29928ae923b17525f16c6a890afd99f49d19 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 7 Jan 2008 19:00:46 +0100 Subject: [PATCH] --- yaml --- r: 78054 b: refs/heads/master c: f6ed10ab972b00cd57567a2ac9e393226840e458 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/au1000/mtx-1/platform.c | 27 ++++++++++++++++++++++++- trunk/arch/mips/configs/mtx1_defconfig | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 00a16449947c..d03545faea81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d47c58efadd33b8399f3f440b7e9cf93692f262 +refs/heads/master: f6ed10ab972b00cd57567a2ac9e393226840e458 diff --git a/trunk/arch/mips/au1000/mtx-1/platform.c b/trunk/arch/mips/au1000/mtx-1/platform.c index 49c0fb409fea..ce8637b3afa9 100644 --- a/trunk/arch/mips/au1000/mtx-1/platform.c +++ b/trunk/arch/mips/au1000/mtx-1/platform.c @@ -22,9 +22,32 @@ #include #include #include +#include +#include #include +static struct gpio_keys_button mtx1_gpio_button[] = { + { + .gpio = 207, + .code = BTN_0, + .desc = "System button", + } +}; + +static struct gpio_keys_platform_data mtx1_buttons_data = { + .buttons = mtx1_gpio_button, + .nbuttons = ARRAY_SIZE(mtx1_gpio_button), +}; + +static struct platform_device mtx1_button = { + .name = "gpio-keys", + .id = -1, + .dev = { + .platform_data = &mtx1_buttons_data, + } +}; + static struct resource mtx1_wdt_res[] = { [0] = { .start = 15, @@ -66,11 +89,13 @@ static struct platform_device mtx1_gpio_leds = { static struct __initdata platform_device * mtx1_devs[] = { &mtx1_gpio_leds, - &mtx1_wdt + &mtx1_wdt, + &mtx1_button }; static int __init mtx1_register_devices(void) { + gpio_direction_input(207); return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs)); } diff --git a/trunk/arch/mips/configs/mtx1_defconfig b/trunk/arch/mips/configs/mtx1_defconfig index be82f123324d..3a34208600d1 100644 --- a/trunk/arch/mips/configs/mtx1_defconfig +++ b/trunk/arch/mips/configs/mtx1_defconfig @@ -1616,6 +1616,7 @@ CONFIG_INPUT_EVBUG=m # CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_XTKBD=m