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

   1 --- a/arch/mips/bcm47xx/board.c
   2 +++ b/arch/mips/bcm47xx/board.c
   3 @@ -140,6 +140,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
   4         {{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"},
   5         {{BCM47XX_BOARD_LINKSYS_WRT310NV1, "Linksys WRT310N V1"}, "WRT310N", "1.0"},
   6         {{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"},
   7 +       {{BCM47XX_BOARD_LINKSYS_WRT320N_V1, "Linksys WRT320N V1"}, "WRT320N", "1.0"},
   8         {{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
   9         {{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
  10         {{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
  11 @@ -150,6 +151,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
  12  static const
  13  struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
  14         {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
  15 +       {{BCM47XX_BOARD_NETGEAR_R6300_V1, "Netgear R6300 V1"}, "U12H218T00_NETGEAR"},
  16         {{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
  17         {{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
  18         {{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
  19 @@ -162,6 +164,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  20         {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
  21         {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
  22         {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
  23 +       {{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},
  24         {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
  25         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
  26         {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
  27 --- a/arch/mips/bcm47xx/buttons.c
  28 +++ b/arch/mips/bcm47xx/buttons.c
  29 @@ -20,6 +20,12 @@
  30  /* Asus */
  31
  32  static const struct gpio_keys_button
  33 +bcm47xx_buttons_asus_rtn10u[] __initconst = {
  34 +       BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
  35 +       BCM47XX_GPIO_KEY(21, KEY_RESTART),
  36 +};
  37 +
  38 +static const struct gpio_keys_button
  39  bcm47xx_buttons_asus_rtn12[] __initconst = {
  40         BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
  41         BCM47XX_GPIO_KEY(1, KEY_RESTART),
  42 @@ -270,6 +276,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
  43  };
  44
  45  static const struct gpio_keys_button
  46 +bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
  47 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  48 +       BCM47XX_GPIO_KEY(6, KEY_RESTART),
  49 +};
  50 +
  51 +static const struct gpio_keys_button
  52 +bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
  53 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  54 +       BCM47XX_GPIO_KEY(8, KEY_RESTART),
  55 +};
  56 +
  57 +static const struct gpio_keys_button
  58  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
  59         BCM47XX_GPIO_KEY(5, KEY_WIMAX),
  60         BCM47XX_GPIO_KEY(6, KEY_RESTART),
  61 @@ -333,6 +351,11 @@ bcm47xx_buttons_motorola_wr850gv2v3[] __
  62  /* Netgear */
  63
  64  static const struct gpio_keys_button
  65 +bcm47xx_buttons_netgear_r6300_v1[] __initconst = {
  66 +       BCM47XX_GPIO_KEY(6, KEY_RESTART),
  67 +};
  68 +
  69 +static const struct gpio_keys_button
  70  bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
  71         BCM47XX_GPIO_KEY(4, KEY_RESTART),
  72         BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
  73 @@ -360,6 +383,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
  74  };
  75
  76  static const struct gpio_keys_button
  77 +bcm47xx_buttons_netgear_wnr1000_v3[] __initconst = {
  78 +       BCM47XX_GPIO_KEY(3, KEY_RESTART),
  79 +};
  80 +
  81 +static const struct gpio_keys_button
  82  bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
  83         BCM47XX_GPIO_KEY(4, KEY_RESTART),
  84         BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
  85 @@ -414,6 +442,9 @@ int __init bcm47xx_buttons_register(void
  86         int err;
  87
  88         switch (board) {
  89 +       case BCM47XX_BOARD_ASUS_RTN10U:
  90 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u);
  91 +               break;
  92         case BCM47XX_BOARD_ASUS_RTN12:
  93                 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
  94                 break;
  95 @@ -544,6 +575,12 @@ int __init bcm47xx_buttons_register(void
  96         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  97                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
  98                 break;
  99 +       case BCM47XX_BOARD_LINKSYS_WRT310NV2:
 100 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
 101 +               break;
 102 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
 103 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
 104 +               break;
 105         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 106                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
 107                 break;
 108 @@ -580,6 +617,9 @@ int __init bcm47xx_buttons_register(void
 109                 err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_wr850gv2v3);
 110                 break;
 111
 112 +       case BCM47XX_BOARD_NETGEAR_R6300_V1:
 113 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1);
 114 +               break;
 115         case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
 116                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
 117                 break;
 118 @@ -592,6 +632,9 @@ int __init bcm47xx_buttons_register(void
 119         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
 120                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
 121                 break;
 122 +       case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
 123 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr1000_v3);
 124 +               break;
 125         case BCM47XX_BOARD_NETGEAR_WNR3500L:
 126                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
 127                 break;
 128 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 129 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 130 @@ -71,6 +71,7 @@ enum bcm47xx_board {
 131         BCM47XX_BOARD_LINKSYS_WRT300NV11,
 132         BCM47XX_BOARD_LINKSYS_WRT310NV1,
 133         BCM47XX_BOARD_LINKSYS_WRT310NV2,
 134 +       BCM47XX_BOARD_LINKSYS_WRT320N_V1,
 135         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
 136         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
 137         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
 138 @@ -88,6 +89,7 @@ enum bcm47xx_board {
 139         BCM47XX_BOARD_MOTOROLA_WR850GP,
 140         BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
 141
 142 +       BCM47XX_BOARD_NETGEAR_R6300_V1,
 143         BCM47XX_BOARD_NETGEAR_WGR614V8,
 144         BCM47XX_BOARD_NETGEAR_WGR614V9,
 145         BCM47XX_BOARD_NETGEAR_WGR614_V10,
 146 @@ -100,6 +102,7 @@ enum bcm47xx_board {
 147         BCM47XX_BOARD_NETGEAR_WNDR4000,
 148         BCM47XX_BOARD_NETGEAR_WNDR4500V1,
 149         BCM47XX_BOARD_NETGEAR_WNDR4500V2,
 150 +       BCM47XX_BOARD_NETGEAR_WNR1000_V3,
 151         BCM47XX_BOARD_NETGEAR_WNR2000,
 152         BCM47XX_BOARD_NETGEAR_WNR3500L,
 153         BCM47XX_BOARD_NETGEAR_WNR3500U,
 154 --- a/arch/mips/bcm47xx/leds.c
 155 +++ b/arch/mips/bcm47xx/leds.c
 156 @@ -29,6 +29,14 @@
 157  /* Asus */
 158
 159  static const struct gpio_led
 160 +bcm47xx_leds_asus_rtn10u[] __initconst = {
 161 +       BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 162 +       BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 163 +       BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
 164 +       BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
 165 +};
 166 +
 167 +static const struct gpio_led
 168  bcm47xx_leds_asus_rtn12[] __initconst = {
 169         BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 170         BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 171 @@ -313,6 +321,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
 172  };
 173
 174  static const struct gpio_led
 175 +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
 176 +       BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 177 +       BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 178 +       BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 179 +};
 180 +
 181 +static const struct gpio_led
 182  bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
 183         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 184         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 185 @@ -478,6 +493,9 @@ void __init bcm47xx_leds_register(void)
 186         enum bcm47xx_board board = bcm47xx_board_get();
 187
 188         switch (board) {
 189 +       case BCM47XX_BOARD_ASUS_RTN10U:
 190 +               bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u);
 191 +               break;
 192         case BCM47XX_BOARD_ASUS_RTN12:
 193                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
 194                 break;
 195 @@ -611,6 +629,9 @@ void __init bcm47xx_leds_register(void)
 196         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
 197                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
 198                 break;
 199 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
 200 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
 201 +               break;
 202         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 203                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
 204                 break;