target/linux/brcm47xx/patches-3.14/147-MIPS-BCM47xx-Distinguish-WRT54G-series-devices-by-bo.patch

   1 From 41a867cb07443c77c24747dcbad1a40002516469 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Fri, 20 Jun 2014 07:56:39 +0200
   4 Subject: [PATCH] MIPS: BCM47xx: Distinguish WRT54G series devices by boardtype
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Catalin reported that GPIOs used by bcm47xx don't match layout of his
  10 WRT54GS V1.0 board. It seems we need to distinguish these 54G* devices.
  11
  12 Reported-by: Catalin Patulea <cat@vv.carleton.ca>
  13 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  14 Cc: linux-mips@linux-mips.org
  15 Cc: Hauke Mehrtens <hauke@hauke-m.de>
  16 Patchwork: https://patchwork.linux-mips.org/patch/7112/
  17 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  18 ---
  19  arch/mips/bcm47xx/board.c                          |  6 +++---
  20  arch/mips/bcm47xx/buttons.c                        | 10 ++++++----
  21  arch/mips/bcm47xx/leds.c                           | 10 ++++++----
  22  arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h |  4 +++-
  23  4 files changed, 18 insertions(+), 12 deletions(-)
  24
  25 --- a/arch/mips/bcm47xx/board.c
  26 +++ b/arch/mips/bcm47xx/board.c
  27 @@ -188,9 +188,9 @@ struct bcm47xx_board_type_list3 bcm47xx_
  28         {{BCM47XX_BOARD_PHICOMM_M1, "Phicomm M1"}, "0x0590", "80", "0x1104"},
  29         {{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
  30         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "0x04CF", "3500", "02"},
  31 -       {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
  32 -       {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
  33 -       {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
  34 +       {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
  35 +       {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
  36 +       {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
  37         { {0}, NULL},
  38  };
  39
  40 --- a/arch/mips/bcm47xx/buttons.c
  41 +++ b/arch/mips/bcm47xx/buttons.c
  42 @@ -270,7 +270,7 @@ bcm47xx_buttons_linksys_wrt54g3gv2[] __i
  43  };
  44
  45  static const struct gpio_keys_button
  46 -bcm47xx_buttons_linksys_wrt54gsv1[] __initconst = {
  47 +bcm47xx_buttons_linksys_wrt54g_generic[] __initconst = {
  48         BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
  49         BCM47XX_GPIO_KEY(6, KEY_RESTART),
  50  };
  51 @@ -516,12 +516,14 @@ int __init bcm47xx_buttons_register(void
  52         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  53                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
  54                 break;
  55 -       case BCM47XX_BOARD_LINKSYS_WRT54G:
  56 -               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54gsv1);
  57 -               break;
  58         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
  59                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
  60                 break;
  61 +       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101:
  62 +       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
  63 +       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
  64 +               err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g_generic);
  65 +               break;
  66         case BCM47XX_BOARD_LINKSYS_WRT610NV1:
  67                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt610nv1);
  68                 break;
  69 --- a/arch/mips/bcm47xx/leds.c
  70 +++ b/arch/mips/bcm47xx/leds.c
  71 @@ -297,7 +297,7 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
  72  };
  73
  74  static const struct gpio_led
  75 -bcm47xx_leds_linksys_wrt54gsv1[] __initconst = {
  76 +bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
  77         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
  78         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
  79         BCM47XX_GPIO_LED(5, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
  80 @@ -553,12 +553,14 @@ void __init bcm47xx_leds_register(void)
  81         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
  82                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
  83                 break;
  84 -       case BCM47XX_BOARD_LINKSYS_WRT54G:
  85 -               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54gsv1);
  86 -               break;
  87         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
  88                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
  89                 break;
  90 +       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101:
  91 +       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
  92 +       case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
  93 +               bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_generic);
  94 +               break;
  95         case BCM47XX_BOARD_LINKSYS_WRT610NV1:
  96                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt610nv1);
  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,7 +71,9 @@ enum bcm47xx_board {
 101         BCM47XX_BOARD_LINKSYS_WRT310NV1,
 102         BCM47XX_BOARD_LINKSYS_WRT310NV2,
 103         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
 104 -       BCM47XX_BOARD_LINKSYS_WRT54G,
 105 +       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
 106 +       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
 107 +       BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708,
 108         BCM47XX_BOARD_LINKSYS_WRT610NV1,
 109         BCM47XX_BOARD_LINKSYS_WRT610NV2,
 110         BCM47XX_BOARD_LINKSYS_WRTSL54GS,