bcm47xx: Updated devices database for Netgear WNR3500L V2

Update the device databases to contain an entry for the Netgear WNR3500L
v2 router, the same buttons and LEDs mapping as v1 is used.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/target/linux/bcm47xx/base-files/etc/board.d/01_network b/target/linux/bcm47xx/base-files/etc/board.d/01_network
index c3b43b5d37ab4333373ebb19f4322535c4f9141b..bcc3af57f8ded87858a4d9d63d302dd0e6b7e741 100644 (file)
--- a/target/linux/bcm47xx/base-files/etc/board.d/01_network
+++ b/target/linux/bcm47xx/base-files/etc/board.d/01_network
@@ -172,7 +172,8 @@ configure_by_model() {
        "Linksys E3000 V1" | \
        "Linksys WRT610N V2" | \
        "Netgear WNR3500 V2" | \
-       "Netgear WNR3500L")
+       "Netgear WNR3500L" | \
+       "Netgear WNR3500L V2")
                ucidef_add_switch "switch0" \
                        "0:wan" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "8@eth0"
                ;;

diff --git a/target/linux/bcm47xx/patches-5.10/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch b/target/linux/bcm47xx/patches-5.10/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
index bde811c1956578a33cc230b80c3a2b4a20cd9aa5..43c682c45720620b1c37dcbfabd9e1ac9861193f 100644 (file)
--- a/target/linux/bcm47xx/patches-5.10/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
+++ b/target/linux/bcm47xx/patches-5.10/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
@@ -1,6 +1,8 @@
+diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
+index 35266a70e22a..4ef610431802 100644
 --- a/arch/mips/bcm47xx/board.c
 +++ b/arch/mips/bcm47xx/board.c
-@@ -141,6 +141,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
+@@ -141,6 +141,7 @@ struct bcm47xx_board_type_list2 bcm47xx_board_list_boot_hw[] __initconst = {
        {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"},
        {{BCM47XX_BOARD_LINKSYS_WRT310NV1, "Linksys WRT310N V1"}, "WRT310N", "1.0"},
        {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"},
@@ -8,7 +10,7 @@
        {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
        {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
        {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
-@@ -161,9 +162,12 @@ struct bcm47xx_board_type_list1 bcm47xx_
+@@ -161,9 +162,12 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
        {{BCM47XX_BOARD_LUXUL_XWR_600_V1, "Luxul XWR-600 V1"}, "luxul_xwr600_v1"},
        {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
        {{BCM47XX_BOARD_NETGEAR_R6200_V1, "Netgear R6200 V1"}, "U12H192T00_NETGEAR"},
@@ -21,25 +23,44 @@
        {{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"},
+@@ -177,6 +181,7 @@ struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
+       {{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_WNR3500L_V2, "Netgear WNR3500L V2"}, "U12H172T00_NETGEAR"},
+       {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
+       {{BCM47XX_BOARD_NETGEAR_WNR3500V2, "Netgear WNR3500 V2"}, "U12H127T00_NETGEAR"},
+       {{BCM47XX_BOARD_NETGEAR_WNR3500V2VC, "Netgear WNR3500 V2vc"}, "U12H127T70_NETGEAR"},
+@@ -191,6 +196,7 @@ struct bcm47xx_board_type_list3 bcm47xx_board_list_board[] __initconst = {
+       {{BCM47XX_BOARD_PHICOMM_M1, "Phicomm M1"}, "0x0590", "80", "0x1104"},
+       {{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
+       {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "0x04CF", "3500", "02"},
++      {{BCM47XX_BOARD_NETGEAR_WNR3500L_V2, "Netgear WNR3500L V2"}, "0x052b", "3500L", "02"},
+       {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
+       {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
+       {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
+diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
+index 535d84addcdb..38e4a9cbcf4e 100644
 --- a/arch/mips/bcm47xx/buttons.c
 +++ b/arch/mips/bcm47xx/buttons.c
-@@ -27,6 +27,12 @@
+@@ -26,6 +26,12 @@
+ 
  /* Asus */
  
- static const struct gpio_keys_button
++static const struct gpio_keys_button
 +bcm47xx_buttons_asus_rtn10u[] __initconst = {
 +      BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
 +      BCM47XX_GPIO_KEY(21, KEY_RESTART),
 +};
 +
-+static const struct gpio_keys_button
+ static const struct gpio_keys_button
  bcm47xx_buttons_asus_rtn12[] __initconst = {
        BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
-       BCM47XX_GPIO_KEY(1, KEY_RESTART),
-@@ -277,6 +283,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
+@@ -276,6 +282,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __initconst = {
+       BCM47XX_GPIO_KEY(8, KEY_UNKNOWN),
  };
  
- static const struct gpio_keys_button
++static const struct gpio_keys_button
 +bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
 +      BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
 +      BCM47XX_GPIO_KEY(6, KEY_RESTART),
@@ -51,14 +72,14 @@
 +      BCM47XX_GPIO_KEY(8, KEY_RESTART),
 +};
 +
-+static const struct gpio_keys_button
+ static const struct gpio_keys_button
  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
        BCM47XX_GPIO_KEY(5, KEY_WIMAX),
-       BCM47XX_GPIO_KEY(6, KEY_RESTART),
-@@ -392,6 +410,17 @@ bcm47xx_buttons_netgear_r6200_v1[] __ini
+@@ -391,6 +409,17 @@ bcm47xx_buttons_netgear_r6200_v1[] __initconst = {
+       BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
  };
  
- static const struct gpio_keys_button
++static const struct gpio_keys_button
 +bcm47xx_buttons_netgear_r6300_v1[] __initconst = {
 +      BCM47XX_GPIO_KEY(6, KEY_RESTART),
 +};
@@ -69,11 +90,24 @@
 +      BCM47XX_GPIO_KEY(31, KEY_WPS_BUTTON),
 +};
 +
-+static const struct gpio_keys_button
+ static const struct gpio_keys_button
  bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
        BCM47XX_GPIO_KEY(4, KEY_RESTART),
+@@ -430,6 +459,13 @@ bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
        BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
-@@ -478,6 +507,9 @@ int __init bcm47xx_buttons_register(void
+ };
+ 
++static const struct gpio_keys_button
++bcm47xx_buttons_netgear_wnr3500lv2[] __initconst = {
++      BCM47XX_GPIO_KEY(4, KEY_RESTART),
++      BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
++      BCM47XX_GPIO_KEY(8, KEY_RFKILL),
++};
++
+ static const struct gpio_keys_button
+ bcm47xx_buttons_netgear_wnr834bv2[] __initconst = {
+       BCM47XX_GPIO_KEY(6, KEY_RESTART),
+@@ -478,6 +514,9 @@ int __init bcm47xx_buttons_register(void)
        int err;
  
        switch (board) {
@@ -83,7 +117,7 @@
        case BCM47XX_BOARD_ASUS_RTN12:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
                break;
-@@ -608,6 +640,12 @@ int __init bcm47xx_buttons_register(void
+@@ -608,6 +647,12 @@ int __init bcm47xx_buttons_register(void)
        case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
                break;
@@ -96,7 +130,7 @@
        case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
                break;
-@@ -674,6 +712,12 @@ int __init bcm47xx_buttons_register(void
+@@ -674,6 +719,12 @@ int __init bcm47xx_buttons_register(void)
        case BCM47XX_BOARD_NETGEAR_R6200_V1:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6200_v1);
                break;
@@ -109,35 +143,25 @@
        case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
                break;
---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
-@@ -72,6 +72,7 @@ enum bcm47xx_board {
-       BCM47XX_BOARD_LINKSYS_WRT300NV11,
-       BCM47XX_BOARD_LINKSYS_WRT310NV1,
-       BCM47XX_BOARD_LINKSYS_WRT310NV2,
-+      BCM47XX_BOARD_LINKSYS_WRT320N_V1,
-       BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
-       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
-       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
-@@ -99,9 +100,12 @@ enum bcm47xx_board {
-       BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
- 
-       BCM47XX_BOARD_NETGEAR_R6200_V1,
-+      BCM47XX_BOARD_NETGEAR_R6300_V1,
-       BCM47XX_BOARD_NETGEAR_WGR614V8,
-       BCM47XX_BOARD_NETGEAR_WGR614V9,
-       BCM47XX_BOARD_NETGEAR_WGR614_V10,
-+      BCM47XX_BOARD_NETGEAR_WN2500RP_V1,
-+      BCM47XX_BOARD_NETGEAR_WN2500RP_V2,
-       BCM47XX_BOARD_NETGEAR_WNDR3300,
-       BCM47XX_BOARD_NETGEAR_WNDR3400V1,
-       BCM47XX_BOARD_NETGEAR_WNDR3400V2,
+@@ -692,6 +743,9 @@ int __init bcm47xx_buttons_register(void)
+       case BCM47XX_BOARD_NETGEAR_WNR3500L:
+               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
+               break;
++      case BCM47XX_BOARD_NETGEAR_WNR3500L_V2:
++              err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv2);
++              break;
+       case BCM47XX_BOARD_NETGEAR_WNR834BV2:
+               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr834bv2);
+               break;
+diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
+index 167c42c71e79..8e257d0896d2 100644
 --- a/arch/mips/bcm47xx/leds.c
 +++ b/arch/mips/bcm47xx/leds.c
-@@ -30,6 +30,14 @@
+@@ -29,6 +29,14 @@
+ 
  /* Asus */
  
- static const struct gpio_led
++static const struct gpio_led
 +bcm47xx_leds_asus_rtn10u[] __initconst = {
 +      BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 +      BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
@@ -145,25 +169,39 @@
 +      BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
 +};
 +
-+static const struct gpio_led
+ static const struct gpio_led
  bcm47xx_leds_asus_rtn12[] __initconst = {
        BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
-       BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
-@@ -314,6 +322,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
+@@ -313,6 +321,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initconst = {
+       BCM47XX_GPIO_LED(9, "blue", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  };
  
- static const struct gpio_led
++static const struct gpio_led
 +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
 +      BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 +      BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 +      BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 +};
 +
-+static const struct gpio_led
+ static const struct gpio_led
  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),
-@@ -556,6 +571,9 @@ void __init bcm47xx_leds_register(void)
+@@ -512,6 +527,14 @@ bcm47xx_leds_netgear_wnr3500lv1[] __initconst = {
+       BCM47XX_GPIO_LED(7, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
+ };
+ 
++static const struct gpio_led
++bcm47xx_leds_netgear_wnr3500lv2[] __initconst = {
++      BCM47XX_GPIO_LED(0, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
++      BCM47XX_GPIO_LED(1, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
++      BCM47XX_GPIO_LED(3, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
++      BCM47XX_GPIO_LED(7, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
++};
++
+ static const struct gpio_led
+ bcm47xx_leds_netgear_wnr834bv2[] __initconst = {
+       BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
+@@ -556,6 +579,9 @@ void __init bcm47xx_leds_register(void)
        enum bcm47xx_board board = bcm47xx_board_get();
  
        switch (board) {
@@ -173,7 +211,7 @@
        case BCM47XX_BOARD_ASUS_RTN12:
                bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
                break;
-@@ -689,6 +707,9 @@ void __init bcm47xx_leds_register(void)
+@@ -689,6 +715,9 @@ void __init bcm47xx_leds_register(void)
        case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
                break;
@@ -183,3 +221,58 @@
        case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
                break;
+@@ -770,6 +799,9 @@ void __init bcm47xx_leds_register(void)
+       case BCM47XX_BOARD_NETGEAR_WNR3500L:
+               bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv1);
+               break;
++      case BCM47XX_BOARD_NETGEAR_WNR3500L_V2:
++              bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv2);
++              break;
+       case BCM47XX_BOARD_NETGEAR_WNR834BV2:
+               bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr834bv2);
+               break;
+diff --git a/arch/mips/bcm47xx/workarounds.c b/arch/mips/bcm47xx/workarounds.c
+index 0ab95dd431b3..745c6228eb2c 100644
+--- a/arch/mips/bcm47xx/workarounds.c
++++ b/arch/mips/bcm47xx/workarounds.c
+@@ -22,6 +22,7 @@ void __init bcm47xx_workarounds(void)
+ 
+       switch (board) {
+       case BCM47XX_BOARD_NETGEAR_WNR3500L:
++      case BCM47XX_BOARD_NETGEAR_WNR3500L_V2:
+               bcm47xx_workarounds_enable_usb_power(12);
+               break;
+       case BCM47XX_BOARD_NETGEAR_WNDR3400V2:
+diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+index f879be3e8099..30f4114ab872 100644
+--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
++++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+@@ -72,6 +72,7 @@ enum bcm47xx_board {
+       BCM47XX_BOARD_LINKSYS_WRT300NV11,
+       BCM47XX_BOARD_LINKSYS_WRT310NV1,
+       BCM47XX_BOARD_LINKSYS_WRT310NV2,
++      BCM47XX_BOARD_LINKSYS_WRT320N_V1,
+       BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
+       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
+       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
+@@ -99,9 +100,12 @@ enum bcm47xx_board {
+       BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
+ 
+       BCM47XX_BOARD_NETGEAR_R6200_V1,
++      BCM47XX_BOARD_NETGEAR_R6300_V1,
+       BCM47XX_BOARD_NETGEAR_WGR614V8,
+       BCM47XX_BOARD_NETGEAR_WGR614V9,
+       BCM47XX_BOARD_NETGEAR_WGR614_V10,
++      BCM47XX_BOARD_NETGEAR_WN2500RP_V1,
++      BCM47XX_BOARD_NETGEAR_WN2500RP_V2,
+       BCM47XX_BOARD_NETGEAR_WNDR3300,
+       BCM47XX_BOARD_NETGEAR_WNDR3400V1,
+       BCM47XX_BOARD_NETGEAR_WNDR3400V2,
+@@ -114,6 +118,7 @@ enum bcm47xx_board {
+       BCM47XX_BOARD_NETGEAR_WNR1000_V3,
+       BCM47XX_BOARD_NETGEAR_WNR2000,
+       BCM47XX_BOARD_NETGEAR_WNR3500L,
++      BCM47XX_BOARD_NETGEAR_WNR3500L_V2,
+       BCM47XX_BOARD_NETGEAR_WNR3500U,
+       BCM47XX_BOARD_NETGEAR_WNR3500V2,
+       BCM47XX_BOARD_NETGEAR_WNR3500V2VC,