target/linux/brcm47xx/patches-3.14/151-MIPS-BCM47XX-Devices-database-update-for-3.17.patch

   1 From 9194b3431616567ffbf69ef970506d695912be0b Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Thu, 17 Jul 2014 23:24:30 +0200
   4 Subject: [PATCH] MIPS: BCM47XX: Devices database update for 3.17
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Detect more devices and register leds & buttons for them.
  10
  11 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  12 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  13 Cc: linux-mips@linux-mips.org
  14 Patchwork: https://patchwork.linux-mips.org/patch/7394/
  15 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  16 ---
  17  arch/mips/bcm47xx/board.c   |  3 ++-
  18  arch/mips/bcm47xx/buttons.c |  9 ++++++++
  19  arch/mips/bcm47xx/leds.c    | 53 +++++++++++++++++++++++++++++++++++++--------
  20  3 files changed, 55 insertions(+), 10 deletions(-)
  21
  22 --- a/arch/mips/bcm47xx/board.c
  23 +++ b/arch/mips/bcm47xx/board.c
  24 @@ -58,6 +58,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  25  static const
  26  struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initconst = {
  27         {{BCM47XX_BOARD_ASUS_RTN10U, "Asus RT-N10U"}, "RTN10U"},
  28 +       {{BCM47XX_BOARD_ASUS_RTN10D, "Asus RT-N10D"}, "RTN10D"},
  29         {{BCM47XX_BOARD_ASUS_RTN12, "Asus RT-N12"}, "RT-N12"},
  30         {{BCM47XX_BOARD_ASUS_RTN12B1, "Asus RT-N12B1"}, "RTN12B1"},
  31         {{BCM47XX_BOARD_ASUS_RTN12C1, "Asus RT-N12C1"}, "RTN12C1"},
  32 @@ -106,7 +107,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
  33  /* ModelId */
  34  static const
  35  struct bcm47xx_board_type_list1 bcm47xx_board_list_ModelId[] __initconst = {
  36 -       {{BCM47XX_BOARD_DELL_TM2300, "Dell WX-5565"}, "WX-5565"},
  37 +       {{BCM47XX_BOARD_DELL_TM2300, "Dell TrueMobile 2300"}, "WX-5565"},
  38         {{BCM47XX_BOARD_MOTOROLA_WE800G, "Motorola WE800G"}, "WE800G"},
  39         {{BCM47XX_BOARD_MOTOROLA_WR850GP, "Motorola WR850GP"}, "WR850GP"},
  40         {{BCM47XX_BOARD_MOTOROLA_WR850GV2V3, "Motorola WR850G"}, "WR850G"},
  41 --- a/arch/mips/bcm47xx/buttons.c
  42 +++ b/arch/mips/bcm47xx/buttons.c
  43 @@ -341,6 +341,12 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
  44  };
  45
  46  static const struct gpio_keys_button
  47 +bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
  48 +       BCM47XX_GPIO_KEY(4, KEY_RESTART),
  49 +       BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
  50 +};
  51 +
  52 +static const struct gpio_keys_button
  53  bcm47xx_buttons_netgear_wnr834bv2[] __initconst = {
  54         BCM47XX_GPIO_KEY(6, KEY_RESTART),
  55  };
  56 @@ -557,6 +563,9 @@ int __init bcm47xx_buttons_register(void
  57         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
  58                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
  59                 break;
  60 +       case BCM47XX_BOARD_NETGEAR_WNR3500L:
  61 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
  62 +               break;
  63         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
  64                 err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr834bv2);
  65                 break;
  66 --- a/arch/mips/bcm47xx/leds.c
  67 +++ b/arch/mips/bcm47xx/leds.c
  68 @@ -35,6 +35,15 @@ bcm47xx_leds_asus_rtn12[] __initconst =
  69  };
  70
  71  static const struct gpio_led
  72 +bcm47xx_leds_asus_rtn15u[] __initconst = {
  73 +       /* TODO: Add "wlan" LED */
  74 +       BCM47XX_GPIO_LED(3, "blue", "wan", 1, LEDS_GPIO_DEFSTATE_OFF),
  75 +       BCM47XX_GPIO_LED(4, "blue", "lan", 1, LEDS_GPIO_DEFSTATE_OFF),
  76 +       BCM47XX_GPIO_LED(6, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  77 +       BCM47XX_GPIO_LED(9, "blue", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
  78 +};
  79 +
  80 +static const struct gpio_led
  81  bcm47xx_leds_asus_rtn16[] __initconst = {
  82         BCM47XX_GPIO_LED(1, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  83         BCM47XX_GPIO_LED(7, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
  84 @@ -42,8 +51,8 @@ bcm47xx_leds_asus_rtn16[] __initconst =
  85
  86  static const struct gpio_led
  87  bcm47xx_leds_asus_rtn66u[] __initconst = {
  88 -       BCM47XX_GPIO_LED(12, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  89 -       BCM47XX_GPIO_LED(15, "unk", "usb", 1, LEDS_GPIO_DEFSTATE_OFF),
  90 +       BCM47XX_GPIO_LED(12, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
  91 +       BCM47XX_GPIO_LED(15, "blue", "usb", 1, LEDS_GPIO_DEFSTATE_OFF),
  92  };
  93
  94  static const struct gpio_led
  95 @@ -221,8 +230,8 @@ bcm47xx_leds_linksys_e1000v1[] __initcon
  96
  97  static const struct gpio_led
  98  bcm47xx_leds_linksys_e1000v21[] __initconst = {
  99 -       BCM47XX_GPIO_LED(5, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 100 -       BCM47XX_GPIO_LED(6, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 101 +       BCM47XX_GPIO_LED(5, "blue", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
 102 +       BCM47XX_GPIO_LED(6, "blue", "power", 1, LEDS_GPIO_DEFSTATE_ON),
 103         BCM47XX_GPIO_LED(7, "amber", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
 104         BCM47XX_GPIO_LED(8, "blue", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
 105  };
 106 @@ -319,6 +328,16 @@ bcm47xx_leds_linksys_wrt54g_type_0101[]
 107         BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 108  };
 109
 110 +/* Verified on: WRT54GL V1.1 */
 111 +static const struct gpio_led
 112 +bcm47xx_leds_linksys_wrt54g_type_0467[] __initconst = {
 113 +       BCM47XX_GPIO_LED(0, "green", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 114 +       BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 115 +       BCM47XX_GPIO_LED(2, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 116 +       BCM47XX_GPIO_LED(3, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 117 +       BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 118 +};
 119 +
 120  static const struct gpio_led
 121  bcm47xx_leds_linksys_wrt610nv1[] __initconst = {
 122         BCM47XX_GPIO_LED(0, "unk", "usb",  1, LEDS_GPIO_DEFSTATE_OFF),
 123 @@ -338,11 +357,10 @@ bcm47xx_leds_linksys_wrt610nv2[] __initc
 124
 125  static const struct gpio_led
 126  bcm47xx_leds_linksys_wrtsl54gs[] __initconst = {
 127 -       BCM47XX_GPIO_LED(0, "unk", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 128 -       BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 129 -       BCM47XX_GPIO_LED(2, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 130 -       BCM47XX_GPIO_LED(3, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 131 -       BCM47XX_GPIO_LED(7, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 132 +       BCM47XX_GPIO_LED(0, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
 133 +       BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 134 +       BCM47XX_GPIO_LED(5, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 135 +       BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 136  };
 137
 138  /* Microsoft */
 139 @@ -397,6 +415,15 @@ bcm47xx_leds_netgear_wndr4500v1[] __init
 140  };
 141
 142  static const struct gpio_led
 143 +bcm47xx_leds_netgear_wnr3500lv1[] __initconst = {
 144 +       BCM47XX_GPIO_LED(0, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
 145 +       BCM47XX_GPIO_LED(1, "green", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
 146 +       BCM47XX_GPIO_LED(2, "green", "wan", 1, LEDS_GPIO_DEFSTATE_OFF),
 147 +       BCM47XX_GPIO_LED(3, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 148 +       BCM47XX_GPIO_LED(7, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
 149 +};
 150 +
 151 +static const struct gpio_led
 152  bcm47xx_leds_netgear_wnr834bv2[] __initconst = {
 153         BCM47XX_GPIO_LED(2, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),
 154         BCM47XX_GPIO_LED(3, "amber", "power", 0, LEDS_GPIO_DEFSTATE_OFF),
 155 @@ -437,6 +464,9 @@ void __init bcm47xx_leds_register(void)
 156         case BCM47XX_BOARD_ASUS_RTN12:
 157                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
 158                 break;
 159 +       case BCM47XX_BOARD_ASUS_RTN15U:
 160 +               bcm47xx_set_pdata(bcm47xx_leds_asus_rtn15u);
 161 +               break;
 162         case BCM47XX_BOARD_ASUS_RTN16:
 163                 bcm47xx_set_pdata(bcm47xx_leds_asus_rtn16);
 164                 break;
 165 @@ -568,6 +598,8 @@ void __init bcm47xx_leds_register(void)
 166                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0101);
 167                 break;
 168         case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
 169 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_type_0467);
 170 +               break;
 171         case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
 172                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_generic);
 173                 break;
 174 @@ -601,6 +633,9 @@ void __init bcm47xx_leds_register(void)
 175         case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
 176                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wndr4500v1);
 177                 break;
 178 +       case BCM47XX_BOARD_NETGEAR_WNR3500L:
 179 +               bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr3500lv1);
 180 +               break;
 181         case BCM47XX_BOARD_NETGEAR_WNR834BV2:
 182                 bcm47xx_set_pdata(bcm47xx_leds_netgear_wnr834bv2);
 183                 break;