refresh 2.6.32 patches, fix livebox support (#6821)
[openwrt/staging/yousong.git] / target / linux / brcm63xx / patches-2.6.32 / 100-reset_buttons.patch
1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
3 @@ -15,6 +15,8 @@
4 #include <linux/mtd/partitions.h>
5 #include <linux/mtd/physmap.h>
6 #include <linux/ssb/ssb.h>
7 +#include <linux/gpio_buttons.h>
8 +#include <linux/input.h>
9 #include <asm/addrspace.h>
10 #include <bcm63xx_board.h>
11 #include <bcm63xx_cpu.h>
12 @@ -288,6 +290,16 @@ static struct board_info __initdata boar
13 .active_low = 1,
14 },
15 },
16 + .reset_buttons = {
17 + {
18 + .desc = "reset",
19 + .gpio = 32,
20 + .active_low = 1,
21 + .type = EV_KEY,
22 + .code = BTN_0,
23 + .threshold = 3,
24 + },
25 + },
26 };
27
28 static struct board_info __initdata board_96348gw = {
29 @@ -345,6 +357,16 @@ static struct board_info __initdata boar
30 .active_low = 1,
31 },
32 },
33 + .reset_buttons = {
34 + {
35 + .desc = "reset",
36 + .gpio = 36,
37 + .active_low = 1,
38 + .type = EV_KEY,
39 + .code = BTN_0,
40 + .threshold = 3,
41 + },
42 + },
43 };
44
45 static struct board_info __initdata board_FAST2404 = {
46 @@ -771,6 +793,16 @@ static struct platform_device bcm63xx_gp
47 .dev.platform_data = &bcm63xx_led_data,
48 };
49
50 +static struct gpio_buttons_platform_data bcm63xx_gpio_buttons_data = {
51 + .poll_interval = 20,
52 +};
53 +
54 +static struct platform_device bcm63xx_gpio_buttons_device = {
55 + .name = "gpio-buttons",
56 + .id = 0,
57 + .dev.platform_data = &bcm63xx_gpio_buttons_data,
58 +};
59 +
60 /*
61 * third stage init callback, register all board devices.
62 */
63 @@ -826,6 +858,13 @@ int __init board_register_devices(void)
64
65 platform_device_register(&bcm63xx_gpio_leds);
66
67 + if (board.reset_buttons) {
68 + bcm63xx_gpio_buttons_data.nbuttons = ARRAY_SIZE(board.reset_buttons);
69 + bcm63xx_gpio_buttons_data.buttons = board.reset_buttons;
70 +
71 + platform_device_register(&bcm63xx_gpio_buttons_device);
72 + }
73 +
74 return 0;
75 }
76
77 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
78 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
79 @@ -55,6 +55,9 @@ struct board_info {
80
81 /* GPIO LEDs */
82 struct gpio_led leds[5];
83 +
84 + /* Reset button */
85 + struct gpio_button reset_buttons[1];
86 };
87
88 #endif /* ! BOARD_BCM963XX_H_ */