X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/30d80a23d93d187771bc837c50c083a555820be3..c791c2bc42006b57f52b5cc85871e32ac2d4c390:/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch

diff --git a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
index 57ce7fc8d..38ab54c58 100644
--- a/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-2.6.32/221-board-NB4.patch
@@ -21,7 +21,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -713,6 +720,441 @@ static struct board_info __initdata boar
+@@ -727,6 +734,471 @@ static struct board_info __initdata boar
  
  	.has_ohci0 = 1,
  };
@@ -117,15 +117,21 @@
 +			.active_low	= 1,
 +		},
 +	},
-+	.reset_buttons = {
++	.buttons = {
 +		{
 +			.desc		= "reset",
 +			.gpio		= 34,
-+			.active_low	= 1,
 +			.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),
@@ -203,15 +209,21 @@
 +			.active_low	= 1,
 +		},
 +	},
-+	.reset_buttons = {
++	.buttons = {
 +		{
 +			.desc		= "reset",
 +			.gpio		= 34,
-+			.active_low	= 1,
 +			.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),
@@ -287,15 +299,21 @@
 +			.active_low	= 1,
 +		},
 +	},
-+	.reset_buttons = {
++	.buttons = {
 +		{
 +			.desc		= "reset",
 +			.gpio		= 34,
-+			.active_low	= 1,
 +			.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),
@@ -368,15 +386,21 @@
 +			.gpio		= 4,
 +		},
 +	},
-+	.reset_buttons = {
++	.buttons = {
 +		{
 +			.desc		= "reset",
 +			.gpio		= 34,
-+			.active_low	= 1,
 +			.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),
@@ -447,15 +471,21 @@
 +			.gpio		= 4,
 +		},
 +	},
-+	.reset_buttons = {
++	.buttons = {
 +		{
 +			.desc		= "reset",
 +			.gpio		= 34,
-+			.active_low	= 1,
 +			.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),
@@ -463,7 +493,7 @@
  #endif
  
  /*
-@@ -743,9 +1185,30 @@ static const struct board_info __initdat
+@@ -757,9 +1229,30 @@ static const struct board_info __initdat
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
@@ -494,7 +524,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -793,6 +1256,9 @@ void __init board_prom_init(void)
+@@ -807,6 +1300,9 @@ void __init board_prom_init(void)
  		return;
  	}
  
@@ -504,14 +534,3 @@
  	/* find board by name */
  	for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
  		if (strncmp(nvram.name, bcm963xx_boards[i]->name,
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -55,7 +55,7 @@ struct board_info {
- 	struct bcm63xx_dsp_platform_data dsp;
- 
- 	/* GPIO LEDs */
--	struct gpio_led leds[8];
-+	struct gpio_led leds[9];
- 
- 	/* Reset button */
- 	struct gpio_button reset_buttons[1];