target/linux/brcm47xx/patches-4.0/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 @@ -270,6 +270,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
  14  };
  15
  16  static const struct gpio_keys_button
  17 +bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
  18 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  19 +       BCM47XX_GPIO_KEY(6, KEY_RESTART),
  20 +};
  21 +
  22 +static const struct gpio_keys_button
  23 +bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
  24 +       BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
  25 +       BCM47XX_GPIO_KEY(8, KEY_RESTART),
  26 +};
  27 +
  28 +static const struct gpio_keys_button
  29  bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
  30         BCM47XX_GPIO_KEY(5, KEY_WIMAX),
  31         BCM47XX_GPIO_KEY(6, KEY_RESTART),
  32 @@ -537,6 +549,12 @@ int __init bcm47xx_buttons_register(void
  33         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  34                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
  35                 break;
  36 +       case BCM47XX_BOARD_LINKSYS_WRT310NV2:
  37 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
  38 +               break;
  39 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
  40 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
  41 +               break;
  42         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
  43                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
  44                 break;
  45 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
  46 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
  47 @@ -71,6 +71,7 @@ enum bcm47xx_board {
  48         BCM47XX_BOARD_LINKSYS_WRT300NV11,
  49         BCM47XX_BOARD_LINKSYS_WRT310NV1,
  50         BCM47XX_BOARD_LINKSYS_WRT310NV2,
  51 +       BCM47XX_BOARD_LINKSYS_WRT320N_V1,
  52         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
  53         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
  54         BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
  55 --- a/arch/mips/bcm47xx/leds.c
  56 +++ b/arch/mips/bcm47xx/leds.c
  57 @@ -313,6 +313,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
  58  };
  59
  60  static const struct gpio_led
  61 +bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
  62 +       BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
  63 +       BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  64 +       BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  65 +};
  66 +
  67 +static const struct gpio_led
  68  bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
  69         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
  70         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  71 @@ -601,6 +608,9 @@ void __init bcm47xx_leds_register(void)
  72         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  73                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
  74                 break;
  75 +       case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
  76 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
  77 +               break;
  78         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
  79                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
  80                 break;