diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/au1000/mtx-1/platform.c | 27 | ||||
-rw-r--r-- | arch/mips/configs/mtx1_defconfig | 1 |
2 files changed, 27 insertions, 1 deletions
diff --git a/arch/mips/au1000/mtx-1/platform.c b/arch/mips/au1000/mtx-1/platform.c index 49c0fb409fea..ce8637b3afa9 100644 --- a/arch/mips/au1000/mtx-1/platform.c +++ b/arch/mips/au1000/mtx-1/platform.c | |||
@@ -22,9 +22,32 @@ | |||
22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/leds.h> | 24 | #include <linux/leds.h> |
25 | #include <linux/gpio_keys.h> | ||
26 | #include <linux/input.h> | ||
25 | 27 | ||
26 | #include <asm/gpio.h> | 28 | #include <asm/gpio.h> |
27 | 29 | ||
30 | static struct gpio_keys_button mtx1_gpio_button[] = { | ||
31 | { | ||
32 | .gpio = 207, | ||
33 | .code = BTN_0, | ||
34 | .desc = "System button", | ||
35 | } | ||
36 | }; | ||
37 | |||
38 | static struct gpio_keys_platform_data mtx1_buttons_data = { | ||
39 | .buttons = mtx1_gpio_button, | ||
40 | .nbuttons = ARRAY_SIZE(mtx1_gpio_button), | ||
41 | }; | ||
42 | |||
43 | static struct platform_device mtx1_button = { | ||
44 | .name = "gpio-keys", | ||
45 | .id = -1, | ||
46 | .dev = { | ||
47 | .platform_data = &mtx1_buttons_data, | ||
48 | } | ||
49 | }; | ||
50 | |||
28 | static struct resource mtx1_wdt_res[] = { | 51 | static struct resource mtx1_wdt_res[] = { |
29 | [0] = { | 52 | [0] = { |
30 | .start = 15, | 53 | .start = 15, |
@@ -66,11 +89,13 @@ static struct platform_device mtx1_gpio_leds = { | |||
66 | 89 | ||
67 | static struct __initdata platform_device * mtx1_devs[] = { | 90 | static struct __initdata platform_device * mtx1_devs[] = { |
68 | &mtx1_gpio_leds, | 91 | &mtx1_gpio_leds, |
69 | &mtx1_wdt | 92 | &mtx1_wdt, |
93 | &mtx1_button | ||
70 | }; | 94 | }; |
71 | 95 | ||
72 | static int __init mtx1_register_devices(void) | 96 | static int __init mtx1_register_devices(void) |
73 | { | 97 | { |
98 | gpio_direction_input(207); | ||
74 | return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs)); | 99 | return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs)); |
75 | } | 100 | } |
76 | 101 | ||
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig index be82f123324d..3a34208600d1 100644 --- a/arch/mips/configs/mtx1_defconfig +++ b/arch/mips/configs/mtx1_defconfig | |||
@@ -1616,6 +1616,7 @@ CONFIG_INPUT_EVBUG=m | |||
1616 | # | 1616 | # |
1617 | CONFIG_INPUT_KEYBOARD=y | 1617 | CONFIG_INPUT_KEYBOARD=y |
1618 | CONFIG_KEYBOARD_ATKBD=y | 1618 | CONFIG_KEYBOARD_ATKBD=y |
1619 | CONFIG_KEYBOARD_GPIO=y | ||
1619 | CONFIG_KEYBOARD_SUNKBD=m | 1620 | CONFIG_KEYBOARD_SUNKBD=m |
1620 | CONFIG_KEYBOARD_LKKBD=m | 1621 | CONFIG_KEYBOARD_LKKBD=m |
1621 | CONFIG_KEYBOARD_XTKBD=m | 1622 | CONFIG_KEYBOARD_XTKBD=m |