brcm47xx: backport upstream patches for Netgear WNR1000 V3

This includes fix for reading NVRAM content.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

1 files changed, 5 insertions, 43 deletions

diff --git a/target/linux/brcm47xx/patches-4.9/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/brcm47xx/patches-4.9/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
index c5f97ba493..d771081dd0 100644
--- a/target/linux/brcm47xx/patches-4.9/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
+++ b/target/linux/brcm47xx/patches-4.9/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
@@ -21,14 +21,6 @@
  	{{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
  	{{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
  	{{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
-@@ -171,6 +175,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
- 	{{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
- 	{{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
- 	{{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
-+	{{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},
- 	{{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
- 	{{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
- 	{{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
 --- a/arch/mips/bcm47xx/buttons.c
 +++ b/arch/mips/bcm47xx/buttons.c
 @@ -26,6 +26,12 @@
@@ -81,19 +73,7 @@
  bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
  	BCM47XX_GPIO_KEY(4, KEY_RESTART),
  	BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
-@@ -411,6 +440,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
- };
- 
- static const struct gpio_keys_button
-+bcm47xx_buttons_netgear_wnr1000_v3[] __initconst = {
-+	BCM47XX_GPIO_KEY(3, KEY_RESTART),
-+};
-+
-+static const struct gpio_keys_button
- bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
- 	BCM47XX_GPIO_KEY(4, KEY_RESTART),
- 	BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
-@@ -464,6 +498,9 @@ int __init bcm47xx_buttons_register(void
+@@ -470,6 +499,9 @@ int __init bcm47xx_buttons_register(void
  	int err;
  
  	switch (board) {
@@ -103,7 +83,7 @@
  	case BCM47XX_BOARD_ASUS_RTN12:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
  		break;
-@@ -594,6 +631,12 @@ int __init bcm47xx_buttons_register(void
+@@ -600,6 +632,12 @@ int __init bcm47xx_buttons_register(void
  	case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
  		break;
@@ -116,7 +96,7 @@
  	case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
  		break;
-@@ -657,6 +700,12 @@ int __init bcm47xx_buttons_register(void
+@@ -663,6 +701,12 @@ int __init bcm47xx_buttons_register(void
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_wr850gv2v3);
  		break;
  
@@ -129,16 +109,6 @@
  	case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
  		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
  		break;
-@@ -669,6 +718,9 @@ int __init bcm47xx_buttons_register(void
- 	case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
- 		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
- 		break;
-+	case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
-+		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr1000_v3);
-+		break;
- 	case BCM47XX_BOARD_NETGEAR_WNR3500L:
- 		err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
- 		break;
 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 @@ -71,6 +71,7 @@ enum bcm47xx_board {
@@ -162,14 +132,6 @@
  	BCM47XX_BOARD_NETGEAR_WNDR3300,
  	BCM47XX_BOARD_NETGEAR_WNDR3400V1,
  	BCM47XX_BOARD_NETGEAR_WNDR3400V2,
-@@ -109,6 +113,7 @@ enum bcm47xx_board {
- 	BCM47XX_BOARD_NETGEAR_WNDR4000,
- 	BCM47XX_BOARD_NETGEAR_WNDR4500V1,
- 	BCM47XX_BOARD_NETGEAR_WNDR4500V2,
-+	BCM47XX_BOARD_NETGEAR_WNR1000_V3,
- 	BCM47XX_BOARD_NETGEAR_WNR2000,
- 	BCM47XX_BOARD_NETGEAR_WNR3500L,
- 	BCM47XX_BOARD_NETGEAR_WNR3500U,
 --- a/arch/mips/bcm47xx/leds.c
 +++ b/arch/mips/bcm47xx/leds.c
 @@ -29,6 +29,14 @@
@@ -201,7 +163,7 @@
  bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
  	BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
  	BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
-@@ -549,6 +564,9 @@ void __init bcm47xx_leds_register(void)
+@@ -555,6 +570,9 @@ void __init bcm47xx_leds_register(void)
  	enum bcm47xx_board board = bcm47xx_board_get();
  
  	switch (board) {
@@ -211,7 +173,7 @@
  	case BCM47XX_BOARD_ASUS_RTN12:
  		bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
  		break;
-@@ -682,6 +700,9 @@ void __init bcm47xx_leds_register(void)
+@@ -688,6 +706,9 @@ void __init bcm47xx_leds_register(void)
  	case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  		bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
  		break;