brcm47xx: add Netgear WNR1000 V3 support in the Linux arch code
authorRafał Miłecki <zajec5@gmail.com>
Mon, 7 Sep 2015 16:29:21 +0000 (16:29 +0000)
committerRafał Miłecki <zajec5@gmail.com>
Mon, 7 Sep 2015 16:29:21 +0000 (16:29 +0000)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 46805

target/linux/brcm47xx/patches-3.18/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch
target/linux/brcm47xx/patches-4.1/320-MIPS-BCM47XX-Devices-database-update-for-4.x.patch

index aa4e947..affa569 100644 (file)
@@ -8,6 +8,14 @@
        {{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"},
+@@ -162,6 +163,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
 @@ -20,6 +20,12 @@
  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
        BCM47XX_GPIO_KEY(5, KEY_WIMAX),
        BCM47XX_GPIO_KEY(6, KEY_RESTART),
-@@ -414,6 +432,9 @@ int __init bcm47xx_buttons_register(void
+@@ -360,6 +378,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),
+@@ -414,6 +437,9 @@ int __init bcm47xx_buttons_register(void
        int err;
  
        switch (board) {
@@ -52,7 +72,7 @@
        case BCM47XX_BOARD_ASUS_RTN12:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
                break;
-@@ -544,6 +565,12 @@ int __init bcm47xx_buttons_register(void
+@@ -544,6 +570,12 @@ int __init bcm47xx_buttons_register(void
        case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
                break;
        case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
                break;
+@@ -592,6 +624,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 {
        BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
+@@ -100,6 +101,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 @@
index aa4e947..affa569 100644 (file)
@@ -8,6 +8,14 @@
        {{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"},
+@@ -162,6 +163,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
 @@ -20,6 +20,12 @@
  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
        BCM47XX_GPIO_KEY(5, KEY_WIMAX),
        BCM47XX_GPIO_KEY(6, KEY_RESTART),
-@@ -414,6 +432,9 @@ int __init bcm47xx_buttons_register(void
+@@ -360,6 +378,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),
+@@ -414,6 +437,9 @@ int __init bcm47xx_buttons_register(void
        int err;
  
        switch (board) {
@@ -52,7 +72,7 @@
        case BCM47XX_BOARD_ASUS_RTN12:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
                break;
-@@ -544,6 +565,12 @@ int __init bcm47xx_buttons_register(void
+@@ -544,6 +570,12 @@ int __init bcm47xx_buttons_register(void
        case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
                break;
        case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
                break;
+@@ -592,6 +624,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 {
        BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
+@@ -100,6 +101,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 @@