target/linux/brcm47xx/patches-3.18/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 @@ -162,6 +163,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  12         {{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
  13         {{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
  14         {{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
  15 +       {{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},
  16         {{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
  17         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
  18         {{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
  19 --- a/arch/mips/bcm47xx/buttons.c
  20 +++ b/arch/mips/bcm47xx/buttons.c
  21 @@ -20,6 +20,12 @@
  22  /* Asus */
  23
  24  static const struct gpio_keys_button
  25 +bcm47xx_buttons_asus_rtn10u[] __initconst = {
  26 +       BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
  27 +       BCM47XX_GPIO_KEY(21, KEY_RESTART),
  28 +};
  29 +
  30 +static const struct gpio_keys_button
  31  bcm47xx_buttons_asus_rtn12[] __initconst = {
  32         BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
  33         BCM47XX_GPIO_KEY(1, KEY_RESTART),
  34 @@ -270,6 +276,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
  35  };
  36
  37  static const struct gpio_keys_button
  38 +bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
  39 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  40 +       BCM47XX_GPIO_KEY(6, KEY_RESTART),
  41 +};
  42 +
  43 +static const struct gpio_keys_button
  44 +bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
  45 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  46 +       BCM47XX_GPIO_KEY(8, KEY_RESTART),
  47 +};
  48 +
  49 +static const struct gpio_keys_button
  50  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
  51         BCM47XX_GPIO_KEY(5, KEY_WIMAX),
  52         BCM47XX_GPIO_KEY(6, KEY_RESTART),
  53 @@ -360,6 +378,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
  54  };
  55
  56  static const struct gpio_keys_button
  57 +bcm47xx_buttons_netgear_wnr1000_v3[] __initconst = {
  58 +       BCM47XX_GPIO_KEY(3, KEY_RESTART),
  59 +};
  60 +
  61 +static const struct gpio_keys_button
  62  bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
  63         BCM47XX_GPIO_KEY(4, KEY_RESTART),
  64         BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
  65 @@ -414,6 +437,9 @@ int __init bcm47xx_buttons_register(void
  66         int err;
  67
  68         switch (board) {
  69 +       case BCM47XX_BOARD_ASUS_RTN10U:
  70 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u);
  71 +               break;
  72         case BCM47XX_BOARD_ASUS_RTN12:
  73                 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
  74                 break;
  75 @@ -544,6 +570,12 @@ int __init bcm47xx_buttons_register(void
  76         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  77                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
  78                 break;
  79 +       case BCM47XX_BOARD_LINKSYS_WRT310NV2:
  80 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
  81 +               break;
  82 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
  83 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
  84 +               break;
  85         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
  86                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
  87                 break;
  88 @@ -592,6 +624,9 @@ int __init bcm47xx_buttons_register(void
  89         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
  90                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
  91                 break;
  92 +       case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
  93 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr1000_v3);
  94 +               break;
  95         case BCM47XX_BOARD_NETGEAR_WNR3500L:
  96                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
  97                 break;
  98 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
  99 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
 100 @@ -71,6 +71,7 @@ enum bcm47xx_board {
 101         BCM47XX_BOARD_LINKSYS_WRT300NV11,
 102         BCM47XX_BOARD_LINKSYS_WRT310NV1,
 103         BCM47XX_BOARD_LINKSYS_WRT310NV2,
 104 +       BCM47XX_BOARD_LINKSYS_WRT320N_V1,
 105         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
 106         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
 107         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
 108 @@ -100,6 +101,7 @@ enum bcm47xx_board {
 109         BCM47XX_BOARD_NETGEAR_WNDR4000,
 110         BCM47XX_BOARD_NETGEAR_WNDR4500V1,
 111         BCM47XX_BOARD_NETGEAR_WNDR4500V2,
 112 +       BCM47XX_BOARD_NETGEAR_WNR1000_V3,
 113         BCM47XX_BOARD_NETGEAR_WNR2000,
 114         BCM47XX_BOARD_NETGEAR_WNR3500L,
 115         BCM47XX_BOARD_NETGEAR_WNR3500U,
 116 --- a/arch/mips/bcm47xx/leds.c
 117 +++ b/arch/mips/bcm47xx/leds.c
 118 @@ -29,6 +29,14 @@
 119  /* Asus */
 120
 121  static const struct gpio_led
 122 +bcm47xx_leds_asus_rtn10u[] __initconst = {
 123 +       BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 124 +       BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 125 +       BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
 126 +       BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
 127 +};
 128 +
 129 +static const struct gpio_led
 130  bcm47xx_leds_asus_rtn12[] __initconst = {
 131         BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 132         BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 133 @@ -313,6 +321,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
 134  };
 135
 136  static const struct gpio_led
 137 +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
 138 +       BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 139 +       BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 140 +       BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 141 +};
 142 +
 143 +static const struct gpio_led
 144  bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
 145         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 146         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 147 @@ -478,6 +493,9 @@ void __init bcm47xx_leds_register(void)
 148         enum bcm47xx_board board = bcm47xx_board_get();
 149
 150         switch (board) {
 151 +       case BCM47XX_BOARD_ASUS_RTN10U:
 152 +               bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u);
 153 +               break;
 154         case BCM47XX_BOARD_ASUS_RTN12:
 155                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
 156                 break;
 157 @@ -611,6 +629,9 @@ void __init bcm47xx_leds_register(void)
 158         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
 159                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
 160                 break;
 161 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
 162 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
 163 +               break;
 164         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 165                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
 166                 break;