projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
when changing the mac address of a bridge interface, keep member interface addresses...
[openwrt.git]
/
target
/
linux
/
brcm63xx
/
patches-2.6.33
/
221-board-NB4.patch
diff --git
a/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
b/target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
index
57ce7fc
..
7c17b88
100644
(file)
--- a/
target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
+++ b/
target/linux/brcm63xx/patches-2.6.33/221-board-NB4.patch
@@
-21,7
+21,7
@@
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
static struct bcm963xx_nvram nvram;
static unsigned int mac_addr_used;
static struct board_info board;
-@@ -713,6 +720,4
4
1 @@ static struct board_info __initdata boar
+@@ -713,6 +720,4
7
1 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
.has_ohci0 = 1,
};
@@
-117,15
+117,21
@@
+ .active_low = 1,
+ },
+ },
+ .active_low = 1,
+ },
+ },
-+ .
reset_
buttons = {
++ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
+ {
+ .desc = "reset",
+ .gpio = 34,
-+ .active_low = 1,
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
++ {
++ .desc = "wps",
++ .gpio = 37,
++ .type = EV_KEY,
++ .code = KEY_WPS_BUTTON,
++ .threshold = 3,
++ },
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
@@
-203,15
+209,21
@@
+ .active_low = 1,
+ },
+ },
+ .active_low = 1,
+ },
+ },
-+ .
reset_
buttons = {
++ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
+ {
+ .desc = "reset",
+ .gpio = 34,
-+ .active_low = 1,
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
++ {
++ .desc = "wps",
++ .gpio = 37,
++ .type = EV_KEY,
++ .code = KEY_WPS_BUTTON,
++ .threshold = 3,
++ },
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
@@
-287,15
+299,21
@@
+ .active_low = 1,
+ },
+ },
+ .active_low = 1,
+ },
+ },
-+ .
reset_
buttons = {
++ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
+ {
+ .desc = "reset",
+ .gpio = 34,
-+ .active_low = 1,
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
++ {
++ .desc = "wps",
++ .gpio = 37,
++ .type = EV_KEY,
++ .code = KEY_WPS_BUTTON,
++ .threshold = 3,
++ },
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
@@
-368,15
+386,21
@@
+ .gpio = 4,
+ },
+ },
+ .gpio = 4,
+ },
+ },
-+ .
reset_
buttons = {
++ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
+ {
+ .desc = "reset",
+ .gpio = 34,
-+ .active_low = 1,
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
++ {
++ .desc = "wps",
++ .gpio = 37,
++ .type = EV_KEY,
++ .code = KEY_WPS_BUTTON,
++ .threshold = 3,
++ },
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
@@
-447,15
+471,21
@@
+ .gpio = 4,
+ },
+ },
+ .gpio = 4,
+ },
+ },
-+ .
reset_
buttons = {
++ .buttons = {
+ {
+ .desc = "reset",
+ .gpio = 34,
+ {
+ .desc = "reset",
+ .gpio = 34,
-+ .active_low = 1,
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
+ .type = EV_KEY,
+ .code = KEY_RESTART,
+ .threshold = 3,
+ },
++ {
++ .desc = "wps",
++ .gpio = 37,
++ .type = EV_KEY,
++ .code = KEY_WPS_BUTTON,
++ .threshold = 3,
++ },
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
+ },
+ .devs = neufbox4_devices,
+ .num_devs = ARRAY_SIZE(neufbox4_devices),
@@
-463,7
+493,7
@@
#endif
/*
#endif
/*
-@@ -743,9 +1
18
5,30 @@ static const struct board_info __initdat
+@@ -743,9 +1
21
5,30 @@ static const struct board_info __initdat
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,
@@
-494,7
+524,7
@@
/*
* early init callback, read nvram data from flash and checksum it
*/
/*
* early init callback, read nvram data from flash and checksum it
*/
-@@ -793,6 +12
5
6,9 @@ void __init board_prom_init(void)
+@@ -793,6 +12
8
6,9 @@ void __init board_prom_init(void)
return;
}
return;
}
@@
-513,5
+543,5
@@
- struct gpio_led leds[8];
+ struct gpio_led leds[9];
- struct gpio_led leds[8];
+ struct gpio_led leds[9];
- /*
Reset button
*/
- struct gpio_button
reset_buttons[1
];
+ /*
Buttons
*/
+ struct gpio_button
buttons[2
];
This page took
0.025486 seconds
and
4
git commands to generate.