106 lines
2.5 KiB
Diff
106 lines
2.5 KiB
Diff
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
@@ -15,6 +15,8 @@
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mtd/physmap.h>
|
|
#include <linux/ssb/ssb.h>
|
|
+#include <linux/gpio_buttons.h>
|
|
+#include <linux/input.h>
|
|
#include <asm/addrspace.h>
|
|
#include <bcm63xx_board.h>
|
|
#include <bcm63xx_cpu.h>
|
|
@@ -296,6 +298,16 @@ static struct board_info __initdata boar
|
|
.active_low = 1,
|
|
},
|
|
},
|
|
+ .buttons = {
|
|
+ {
|
|
+ .desc = "reset",
|
|
+ .gpio = 33,
|
|
+ .active_low = 1,
|
|
+ .type = EV_KEY,
|
|
+ .code = KEY_RESTART,
|
|
+ .threshold = 3,
|
|
+ },
|
|
+ },
|
|
};
|
|
|
|
static struct board_info __initdata board_96348gw = {
|
|
@@ -354,6 +366,16 @@ static struct board_info __initdata boar
|
|
.active_low = 1,
|
|
},
|
|
},
|
|
+ .buttons = {
|
|
+ {
|
|
+ .desc = "reset",
|
|
+ .gpio = 36,
|
|
+ .active_low = 1,
|
|
+ .type = EV_KEY,
|
|
+ .code = KEY_RESTART,
|
|
+ .threshold = 3,
|
|
+ },
|
|
+ },
|
|
};
|
|
|
|
static struct board_info __initdata board_FAST2404 = {
|
|
@@ -852,12 +874,23 @@ static struct platform_device bcm63xx_gp
|
|
.dev.platform_data = &bcm63xx_led_data,
|
|
};
|
|
|
|
+static struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = {
|
|
+ .poll_interval = 20,
|
|
+};
|
|
+
|
|
+static struct platform_device bcm63xx_gpio_buttons_device = {
|
|
+ .name = "gpio-buttons",
|
|
+ .id = 0,
|
|
+ .dev.platform_data = &bcm63xx_gpio_buttons_data,
|
|
+};
|
|
+
|
|
/*
|
|
* third stage init callback, register all board devices.
|
|
*/
|
|
int __init board_register_devices(void)
|
|
{
|
|
u32 val;
|
|
+ int button_count = 0;
|
|
|
|
if (board.has_uart0)
|
|
bcm63xx_uart_register(0);
|
|
@@ -912,5 +945,16 @@ int __init board_register_devices(void)
|
|
|
|
platform_device_register(&bcm63xx_gpio_leds);
|
|
|
|
+ /* count number of BUTTONs defined by this device */
|
|
+ while (button_count < ARRAY_SIZE(board.buttons) && board.buttons[button_count].desc)
|
|
+ button_count++;
|
|
+
|
|
+ if (button_count) {
|
|
+ bcm63xx_gpio_buttons_data.nbuttons = button_count;
|
|
+ bcm63xx_gpio_buttons_data.buttons = board.buttons;
|
|
+
|
|
+ platform_device_register(&bcm63xx_gpio_buttons_device);
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
|
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
|
|
@@ -3,6 +3,7 @@
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/gpio.h>
|
|
+#include <linux/gpio_buttons.h>
|
|
#include <linux/leds.h>
|
|
#include <bcm63xx_dev_enet.h>
|
|
#include <bcm63xx_dev_dsp.h>
|
|
@@ -57,6 +58,9 @@ struct board_info {
|
|
|
|
/* GPIO LEDs */
|
|
struct gpio_led leds[5];
|
|
+
|
|
+ /* Buttons */
|
|
+ struct gpio_button buttons[4];
|
|
};
|
|
|
|
#endif /* ! BOARD_BCM963XX_H_ */
|