aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-06-16 14:34:40 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-06-16 14:34:40 +0000
commit426dccd0197090291e35e74e1f801ba2ec386f0d (patch)
tree467322b77c9029f6c20eb0dc4ed18212913c2b2f /target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch
parent235e3319876d5d1354e2774ec73495fdeb2616ec (diff)
downloadupstream-426dccd0197090291e35e74e1f801ba2ec386f0d.tar.gz
upstream-426dccd0197090291e35e74e1f801ba2ec386f0d.tar.bz2
upstream-426dccd0197090291e35e74e1f801ba2ec386f0d.zip
bcm63xx: Add support for Linux 3.0-rc3
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com> SVN-Revision: 27192
Diffstat (limited to 'target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch98
1 files changed, 98 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch b/target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch
new file mode 100644
index 0000000000..486054f901
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.0/100-reset_buttons.patch
@@ -0,0 +1,98 @@
+--- 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 = {
+@@ -850,12 +872,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);
+@@ -900,5 +933,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
+@@ -57,6 +57,9 @@ struct board_info {
+
+ /* GPIO LEDs */
+ struct gpio_led leds[5];
++
++ /* Buttons */
++ struct gpio_button buttons[2];
+ };
+
+ #endif /* ! BOARD_BCM963XX_H_ */