target/linux/bcm47xx/patches-5.10/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 @@ -141,6 +141,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 @@ -161,9 +162,12 @@ struct bcm47xx_board_type_list1 bcm47xx_
  12         {{BCM47XX_BOARD_LUXUL_XWR_600_V1, "Luxul XWR-600 V1"}, "luxul_xwr600_v1"},
  13         {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
  14         {{BCM47XX_BOARD_NETGEAR_R6200_V1, "Netgear R6200 V1"}, "U12H192T00_NETGEAR"},
  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 +       {{BCM47XX_BOARD_NETGEAR_WN2500RP_V1, "Netgear WN2500RP V1"}, "U12H197T00_NETGEAR"},
  20 +       {{BCM47XX_BOARD_NETGEAR_WN2500RP_V2, "Netgear WN2500RP V2"}, "U12H294T00_NETGEAR"},
  21         {{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
  22         {{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
  23         {{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
  24 @@ -177,6 +181,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  25         {{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},
  26         {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
  27         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
  28 +       {{BCM47XX_BOARD_NETGEAR_WNR3500L_V2, "Netgear WNR3500L V2"}, "U12H172T00_NETGEAR"},
  29         {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
  30         {{BCM47XX_BOARD_NETGEAR_WNR3500V2, "Netgear WNR3500 V2"}, "U12H127T00_NETGEAR"},
  31         {{BCM47XX_BOARD_NETGEAR_WNR3500V2VC, "Netgear WNR3500 V2vc"}, "U12H127T70_NETGEAR"},
  32 @@ -191,6 +196,7 @@ struct bcm47xx_board_type_list3 bcm47xx_
  33         {{BCM47XX_BOARD_PHICOMM_M1, "Phicomm M1"}, "0x0590", "80", "0x1104"},
  34         {{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
  35         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "0x04CF", "3500", "02"},
  36 +       {{BCM47XX_BOARD_NETGEAR_WNR3500L_V2, "Netgear WNR3500L V2"}, "0x052b", "3500L", "02"},
  37         {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
  38         {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
  39         {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
  40 --- a/arch/mips/bcm47xx/buttons.c
  41 +++ b/arch/mips/bcm47xx/buttons.c
  42 @@ -27,6 +27,12 @@
  43  /* Asus */
  44
  45  static const struct gpio_keys_button
  46 +bcm47xx_buttons_asus_rtn10u[] __initconst = {
  47 +       BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
  48 +       BCM47XX_GPIO_KEY(21, KEY_RESTART),
  49 +};
  50 +
  51 +static const struct gpio_keys_button
  52  bcm47xx_buttons_asus_rtn12[] __initconst = {
  53         BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
  54         BCM47XX_GPIO_KEY(1, KEY_RESTART),
  55 @@ -277,6 +283,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
  56  };
  57
  58  static const struct gpio_keys_button
  59 +bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
  60 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  61 +       BCM47XX_GPIO_KEY(6, KEY_RESTART),
  62 +};
  63 +
  64 +static const struct gpio_keys_button
  65 +bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
  66 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  67 +       BCM47XX_GPIO_KEY(8, KEY_RESTART),
  68 +};
  69 +
  70 +static const struct gpio_keys_button
  71  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
  72         BCM47XX_GPIO_KEY(5, KEY_WIMAX),
  73         BCM47XX_GPIO_KEY(6, KEY_RESTART),
  74 @@ -392,6 +410,17 @@ bcm47xx_buttons_netgear_r6200_v1[] __ini
  75  };
  76
  77  static const struct gpio_keys_button
  78 +bcm47xx_buttons_netgear_r6300_v1[] __initconst = {
  79 +       BCM47XX_GPIO_KEY(6, KEY_RESTART),
  80 +};
  81 +
  82 +static const struct gpio_keys_button
  83 +bcm47xx_buttons_netgear_wn2500rp_v1[] __initconst = {
  84 +       BCM47XX_GPIO_KEY(12, KEY_RESTART),
  85 +       BCM47XX_GPIO_KEY(31, KEY_WPS_BUTTON),
  86 +};
  87 +
  88 +static const struct gpio_keys_button
  89  bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
  90         BCM47XX_GPIO_KEY(4, KEY_RESTART),
  91         BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
  92 @@ -431,6 +460,13 @@ bcm47xx_buttons_netgear_wnr3500lv1[] __i
  93  };
  94
  95  static const struct gpio_keys_button
  96 +bcm47xx_buttons_netgear_wnr3500lv2[] __initconst = {
  97 +       BCM47XX_GPIO_KEY(4, KEY_RESTART),
  98 +       BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
  99 +       BCM47XX_GPIO_KEY(8, KEY_RFKILL),
 100 +};
 101 +
 102 +static const struct gpio_keys_button
 103  bcm47xx_buttons_netgear_wnr834bv2[] __initconst = {
 104         BCM47XX_GPIO_KEY(6, KEY_RESTART),
 105  };
 106 @@ -478,6 +514,9 @@ int __init bcm47xx_buttons_register(void
 107         int err;
 108
 109         switch (board) {
 110 +       case BCM47XX_BOARD_ASUS_RTN10U:
 111 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u);
 112 +               break;
 113         case BCM47XX_BOARD_ASUS_RTN12:
 114                 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
 115                 break;
 116 @@ -608,6 +647,12 @@ int __init bcm47xx_buttons_register(void
 117         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
 118                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
 119                 break;
 120 +       case BCM47XX_BOARD_LINKSYS_WRT310NV2:
 121 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
 122 +               break;
 123 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
 124 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
 125 +               break;
 126         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 127                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
 128                 break;
 129 @@ -674,6 +719,12 @@ int __init bcm47xx_buttons_register(void
 130         case BCM47XX_BOARD_NETGEAR_R6200_V1:
 131                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6200_v1);
 132                 break;
 133 +       case BCM47XX_BOARD_NETGEAR_R6300_V1:
 134 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1);
 135 +               break;
 136 +       case BCM47XX_BOARD_NETGEAR_WN2500RP_V1:
 137 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wn2500rp_v1);
 138 +               break;
 139         case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
 140                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
 141                 break;
 142 @@ -692,6 +743,9 @@ int __init bcm47xx_buttons_register(void
 143         case BCM47XX_BOARD_NETGEAR_WNR3500L:
 144                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
 145                 break;
 146 +       case BCM47XX_BOARD_NETGEAR_WNR3500L_V2:
 147 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv2);
 148 +               break;
 149         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
 150                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr834bv2);
 151                 break;
 152 --- a/arch/mips/bcm47xx/leds.c
 153 +++ b/arch/mips/bcm47xx/leds.c
 154 @@ -30,6 +30,14 @@
 155  /* Asus */
 156
 157  static const struct gpio_led
 158 +bcm47xx_leds_asus_rtn10u[] __initconst = {
 159 +       BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 160 +       BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 161 +       BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
 162 +       BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
 163 +};
 164 +
 165 +static const struct gpio_led
 166  bcm47xx_leds_asus_rtn12[] __initconst = {
 167         BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 168         BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 169 @@ -314,6 +322,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
 170  };
 171
 172  static const struct gpio_led
 173 +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
 174 +       BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 175 +       BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 176 +       BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 177 +};
 178 +
 179 +static const struct gpio_led
 180  bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
 181         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 182         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 183 @@ -513,6 +528,14 @@ bcm47xx_leds_netgear_wnr3500lv1[] __init
 184  };
 185
 186  static const struct gpio_led
 187 +bcm47xx_leds_netgear_wnr3500lv2[] __initconst = {
 188 +       BCM47XX_GPIO_LED(0, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 189 +       BCM47XX_GPIO_LED(1, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
 190 +       BCM47XX_GPIO_LED(3, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 191 +       BCM47XX_GPIO_LED(7, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
 192 +};
 193 +
 194 +static const struct gpio_led
 195  bcm47xx_leds_netgear_wnr834bv2[] __initconst = {
 196         BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 197         BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
 198 @@ -556,6 +579,9 @@ void __init bcm47xx_leds_register(void)
 199         enum bcm47xx_board board = bcm47xx_board_get();
 200
 201         switch (board) {
 202 +       case BCM47XX_BOARD_ASUS_RTN10U:
 203 +               bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u);
 204 +               break;
 205         case BCM47XX_BOARD_ASUS_RTN12:
 206                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
 207                 break;
 208 @@ -689,6 +715,9 @@ void __init bcm47xx_leds_register(void)
 209         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
 210                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
 211                 break;
 212 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
 213 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
 214 +               break;
 215         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 216                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
 217                 break;
 218 @@ -770,6 +799,9 @@ void __init bcm47xx_leds_register(void)
 219         case BCM47XX_BOARD_NETGEAR_WNR3500L:
 220                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv1);
 221                 break;
 222 +       case BCM47XX_BOARD_NETGEAR_WNR3500L_V2:
 223 +               bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv2);
 224 +               break;
 225         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
 226                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr834bv2);
 227                 break;
 228 --- a/arch/mips/bcm47xx/workarounds.c
 229 +++ b/arch/mips/bcm47xx/workarounds.c
 230 @@ -22,6 +22,7 @@ void __init bcm47xx_workarounds(void)
 231
 232         switch (board) {
 233         case BCM47XX_BOARD_NETGEAR_WNR3500L:
 234 +       case BCM47XX_BOARD_NETGEAR_WNR3500L_V2:
 235                 bcm47xx_workarounds_enable_usb_power(12);
 236                 break;
 237         case BCM47XX_BOARD_NETGEAR_WNDR3400V2:
 238 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 239 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 240 @@ -72,6 +72,7 @@ enum bcm47xx_board {
 241         BCM47XX_BOARD_LINKSYS_WRT300NV11,
 242         BCM47XX_BOARD_LINKSYS_WRT310NV1,
 243         BCM47XX_BOARD_LINKSYS_WRT310NV2,
 244 +       BCM47XX_BOARD_LINKSYS_WRT320N_V1,
 245         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
 246         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
 247         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
 248 @@ -99,9 +100,12 @@ enum bcm47xx_board {
 249         BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
 250
 251         BCM47XX_BOARD_NETGEAR_R6200_V1,
 252 +       BCM47XX_BOARD_NETGEAR_R6300_V1,
 253         BCM47XX_BOARD_NETGEAR_WGR614V8,
 254         BCM47XX_BOARD_NETGEAR_WGR614V9,
 255         BCM47XX_BOARD_NETGEAR_WGR614_V10,
 256 +       BCM47XX_BOARD_NETGEAR_WN2500RP_V1,
 257 +       BCM47XX_BOARD_NETGEAR_WN2500RP_V2,
 258         BCM47XX_BOARD_NETGEAR_WNDR3300,
 259         BCM47XX_BOARD_NETGEAR_WNDR3400V1,
 260         BCM47XX_BOARD_NETGEAR_WNDR3400V2,
 261 @@ -114,6 +118,7 @@ enum bcm47xx_board {
 262         BCM47XX_BOARD_NETGEAR_WNR1000_V3,
 263         BCM47XX_BOARD_NETGEAR_WNR2000,
 264         BCM47XX_BOARD_NETGEAR_WNR3500L,
 265 +       BCM47XX_BOARD_NETGEAR_WNR3500L_V2,
 266         BCM47XX_BOARD_NETGEAR_WNR3500U,
 267         BCM47XX_BOARD_NETGEAR_WNR3500V2,
 268         BCM47XX_BOARD_NETGEAR_WNR3500V2VC,