target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-Devices-database-update-for-3.17.patch

   1 --- a/arch/mips/bcm47xx/leds.c
   2 +++ b/arch/mips/bcm47xx/leds.c
   3 @@ -35,6 +35,15 @@ bcm47xx_leds_asus_rtn12[] __initconst =
   4  };
   5
   6  static const struct gpio_led
   7 +bcm47xx_leds_asus_rtn15u[] __initconst = {
   8 +       /* TODO: Add "wlan" LED */
   9 +       BCM47XX_GPIO_LED(3, "blue", "wan", 1, LEDS_GPIO_DEFSTATE_OFF),
  10 +       BCM47XX_GPIO_LED(4, "blue", "lan", 1, LEDS_GPIO_DEFSTATE_OFF),
  11 +       BCM47XX_GPIO_LED(6, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  12 +       BCM47XX_GPIO_LED(9, "blue", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
  13 +};
  14 +
  15 +static const struct gpio_led
  16  bcm47xx_leds_asus_rtn16[] __initconst = {
  17         BCM47XX_GPIO_LED(1, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  18         BCM47XX_GPIO_LED(7, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
  19 @@ -42,8 +51,8 @@ bcm47xx_leds_asus_rtn16[] __initconst =
  20
  21  static const struct gpio_led
  22  bcm47xx_leds_asus_rtn66u[] __initconst = {
  23 -       BCM47XX_GPIO_LED(12, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  24 -       BCM47XX_GPIO_LED(15, "unk", "usb", 1, LEDS_GPIO_DEFSTATE_OFF),
  25 +       BCM47XX_GPIO_LED(12, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  26 +       BCM47XX_GPIO_LED(15, "blue", "usb", 1, LEDS_GPIO_DEFSTATE_OFF),
  27  };
  28
  29  static const struct gpio_led
  30 @@ -216,8 +225,8 @@ bcm47xx_leds_linksys_e1000v1[] __initcon
  31
  32  static const struct gpio_led
  33  bcm47xx_leds_linksys_e1000v21[] __initconst = {
  34 -       BCM47XX_GPIO_LED(5, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
  35 -       BCM47XX_GPIO_LED(6, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  36 +       BCM47XX_GPIO_LED(5, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
  37 +       BCM47XX_GPIO_LED(6, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  38         BCM47XX_GPIO_LED(7, "amber", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
  39         BCM47XX_GPIO_LED(8, "blue", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
  40  };
  41 @@ -314,6 +323,16 @@ bcm47xx_leds_linksys_wrt54g_type_0101[]
  42         BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
  43  };
  44
  45 +/* Verified on: WRT54GL V1.1 */
  46 +static const struct gpio_led
  47 +bcm47xx_leds_linksys_wrt54g_type_0467[] __initconst = {
  48 +       BCM47XX_GPIO_LED(0, "green", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
  49 +       BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  50 +       BCM47XX_GPIO_LED(2, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  51 +       BCM47XX_GPIO_LED(3, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  52 +       BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
  53 +};
  54 +
  55  static const struct gpio_led
  56  bcm47xx_leds_linksys_wrt610nv1[] __initconst = {
  57         BCM47XX_GPIO_LED(0, "unk", "usb",  1, LEDS_GPIO_DEFSTATE_OFF),
  58 @@ -333,11 +352,10 @@ bcm47xx_leds_linksys_wrt610nv2[] __initc
  59
  60  static const struct gpio_led
  61  bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {
  62 -       BCM47XX_GPIO_LED(0, "unk", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
  63 -       BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  64 -       BCM47XX_GPIO_LED(2, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  65 -       BCM47XX_GPIO_LED(3, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  66 -       BCM47XX_GPIO_LED(7, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
  67 +       BCM47XX_GPIO_LED(0, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
  68 +       BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  69 +       BCM47XX_GPIO_LED(5, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  70 +       BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  71  };
  72
  73  /* Motorola */
  74 @@ -385,6 +403,15 @@ bcm47xx_leds_netgear_wndr4500v1[] __init
  75  };
  76
  77  static const struct gpio_led
  78 +bcm47xx_leds_netgear_wnr3500lv1[] __initconst = {
  79 +       BCM47XX_GPIO_LED(0, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
  80 +       BCM47XX_GPIO_LED(1, "green", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  81 +       BCM47XX_GPIO_LED(2, "green", "wan", 1, LEDS_GPIO_DEFSTATE_OFF),
  82 +       BCM47XX_GPIO_LED(3, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  83 +       BCM47XX_GPIO_LED(7, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
  84 +};
  85 +
  86 +static const struct gpio_led
  87  bcm47xx_leds_netgear_wnr834bv2[] __initconst = {
  88         BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  89         BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
  90 @@ -425,6 +452,9 @@ void __init bcm47xx_leds_register(void)
  91         case BCM47XX_BOARD_ASUS_RTN12:
  92                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
  93                 break;
  94 +       case BCM47XX_BOARD_ASUS_RTN15U:
  95 +               bcm47xx_set_pdata(bcm47xx_leds_asus_rtn15u);
  96 +               break;
  97         case BCM47XX_BOARD_ASUS_RTN16:
  98                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn16);
  99                 break;
 100 @@ -553,6 +583,8 @@ void __init bcm47xx_leds_register(void)
 101                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0101);
 102                 break;
 103         case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
 104 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0467);
 105 +               break;
 106         case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
 107                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_generic);
 108                 break;
 109 @@ -582,6 +614,9 @@ void __init bcm47xx_leds_register(void)
 110         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
 111                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wndr4500v1);
 112                 break;
 113 +       case BCM47XX_BOARD_NETGEAR_WNR3500L:
 114 +               bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv1);
 115 +               break;
 116         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
 117                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr834bv2);
 118                 break;
 119 --- a/arch/mips/bcm47xx/buttons.c
 120 +++ b/arch/mips/bcm47xx/buttons.c
 121 @@ -329,6 +329,12 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
 122  };
 123
 124  static const struct gpio_keys_button
 125 +bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
 126 +       BCM47XX_GPIO_KEY(4, KEY_RESTART),
 127 +       BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
 128 +};
 129 +
 130 +static const struct gpio_keys_button
 131  bcm47xx_buttons_netgear_wnr834bv2[] __initconst = {
 132         BCM47XX_GPIO_KEY(6, KEY_RESTART),
 133  };
 134 @@ -538,6 +544,9 @@ int __init bcm47xx_buttons_register(void
 135         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
 136                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
 137                 break;
 138 +       case BCM47XX_BOARD_NETGEAR_WNR3500L:
 139 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
 140 +               break;
 141         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
 142                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr834bv2);
 143                 break;