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 --- a/arch/mips/bcm47xx/buttons.c
  12 +++ b/arch/mips/bcm47xx/buttons.c
  13 @@ -20,6 +20,12 @@
  14  /* Asus */
  15
  16  static const struct gpio_keys_button
  17 +bcm47xx_buttons_asus_rtn10u[] __initconst = {
  18 +       BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
  19 +       BCM47XX_GPIO_KEY(21, KEY_RESTART),
  20 +};
  21 +
  22 +static const struct gpio_keys_button
  23  bcm47xx_buttons_asus_rtn12[] __initconst = {
  24         BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
  25         BCM47XX_GPIO_KEY(1, KEY_RESTART),
  26 @@ -270,6 +276,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
  27  };
  28
  29  static const struct gpio_keys_button
  30 +bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
  31 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  32 +       BCM47XX_GPIO_KEY(6, KEY_RESTART),
  33 +};
  34 +
  35 +static const struct gpio_keys_button
  36 +bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
  37 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  38 +       BCM47XX_GPIO_KEY(8, KEY_RESTART),
  39 +};
  40 +
  41 +static const struct gpio_keys_button
  42  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
  43         BCM47XX_GPIO_KEY(5, KEY_WIMAX),
  44         BCM47XX_GPIO_KEY(6, KEY_RESTART),
  45 @@ -407,6 +425,9 @@ int __init bcm47xx_buttons_register(void
  46         int err;
  47
  48         switch (board) {
  49 +       case BCM47XX_BOARD_ASUS_RTN10U:
  50 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u);
  51 +               break;
  52         case BCM47XX_BOARD_ASUS_RTN12:
  53                 err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
  54                 break;
  55 @@ -537,6 +558,12 @@ int __init bcm47xx_buttons_register(void
  56         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  57                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
  58                 break;
  59 +       case BCM47XX_BOARD_LINKSYS_WRT310NV2:
  60 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
  61 +               break;
  62 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
  63 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
  64 +               break;
  65         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
  66                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
  67                 break;
  68 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
  69 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
  70 @@ -71,6 +71,7 @@ enum bcm47xx_board {
  71         BCM47XX_BOARD_LINKSYS_WRT300NV11,
  72         BCM47XX_BOARD_LINKSYS_WRT310NV1,
  73         BCM47XX_BOARD_LINKSYS_WRT310NV2,
  74 +       BCM47XX_BOARD_LINKSYS_WRT320N_V1,
  75         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
  76         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
  77         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
  78 --- a/arch/mips/bcm47xx/leds.c
  79 +++ b/arch/mips/bcm47xx/leds.c
  80 @@ -29,6 +29,14 @@
  81  /* Asus */
  82
  83  static const struct gpio_led
  84 +bcm47xx_leds_asus_rtn10u[] __initconst = {
  85 +       BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
  86 +       BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  87 +       BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
  88 +       BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
  89 +};
  90 +
  91 +static const struct gpio_led
  92  bcm47xx_leds_asus_rtn12[] __initconst = {
  93         BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  94         BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
  95 @@ -313,6 +321,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
  96  };
  97
  98  static const struct gpio_led
  99 +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
 100 +       BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 101 +       BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 102 +       BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 103 +};
 104 +
 105 +static const struct gpio_led
 106  bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
 107         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 108         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 109 @@ -468,6 +483,9 @@ void __init bcm47xx_leds_register(void)
 110         enum bcm47xx_board board = bcm47xx_board_get();
 111
 112         switch (board) {
 113 +       case BCM47XX_BOARD_ASUS_RTN10U:
 114 +               bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u);
 115 +               break;
 116         case BCM47XX_BOARD_ASUS_RTN12:
 117                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
 118                 break;
 119 @@ -601,6 +619,9 @@ void __init bcm47xx_leds_register(void)
 120         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
 121                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
 122                 break;
 123 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
 124 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
 125 +               break;
 126         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
 127                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
 128                 break;