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

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