MIPS: BCM47xx: Distinguish WRT54G series devices by boardtype

Catalin reported that GPIOs used by bcm47xx don't match layout of his
WRT54GS V1.0 board. It seems we need to distinguish these 54G* devices.

Reported-by: Catalin Patulea <cat@vv.carleton.ca>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: https://patchwork.linux-mips.org/patch/7112/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

4 files changed, 18 insertions, 12 deletions

diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c
index 7d4ac39ed14c..dbae347d4dc7 100644
--- a/arch/mips/bcm47xx/board.c
+++ b/arch/mips/bcm47xx/board.c
@@ -188,9 +188,9 @@ struct bcm47xx_board_type_list3 bcm47xx_board_list_board[] __initconst = {
         {{BCM47XX_BOARD_PHICOMM_M1, "Phicomm M1"}, "0x0590", "80", "0x1104"},
         {{BCM47XX_BOARD_ZTE_H218N, "ZTE H218N"}, "0x053d", "1234", "0x1305"},
         {{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "0x04CF", "3500", "02"},
-        {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
-        {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
-        {{BCM47XX_BOARD_LINKSYS_WRT54G, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
+        {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101, "Linksys WRT54G/GS/GL"}, "0x0101", "42", "0x10"},
+        {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467, "Linksys WRT54G/GS/GL"}, "0x0467", "42", "0x10"},
+        {{BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708, "Linksys WRT54G/GS/GL"}, "0x0708", "42", "0x10"},
         { {0}, NULL},
 };
 
diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 82dbbbbe800c..0e409c114e80 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -270,7 +270,7 @@ bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
 };
 
 static const struct gpio_keys_button
-bcm47xx_buttons_linksys_wrt54gsv1[] __initconst = {
+bcm47xx_buttons_linksys_wrt54g_generic[] __initconst = {
         BCM47XX_GPIO_KEY(4, KEY_WPS_BUTTON),
         BCM47XX_GPIO_KEY(6, KEY_RESTART),
 };
@@ -516,12 +516,14 @@ int __init bcm47xx_buttons_register(void)
         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
                 break;
-        case BCM47XX_BOARD_LINKSYS_WRT54G:
-                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54gsv1);
-                break;
         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
                 break;
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101:
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
+                err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g_generic);
+                break;
         case BCM47XX_BOARD_LINKSYS_WRT610NV1:
                 err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt610nv1);
                 break;
diff --git a/arch/mips/bcm47xx/leds.c b/arch/mips/bcm47xx/leds.c
index 1e256a91e330..4ad316491224 100644
--- a/arch/mips/bcm47xx/leds.c
+++ b/arch/mips/bcm47xx/leds.c
@@ -297,7 +297,7 @@ bcm47xx_leds_linksys_wrt310nv1[] __initconst = {
 };
 
 static const struct gpio_led
-bcm47xx_leds_linksys_wrt54gsv1[] __initconst = {
+bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
         BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
         BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
         BCM47XX_GPIO_LED(5, "white", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
@@ -553,12 +553,14 @@ void __init bcm47xx_leds_register(void)
         case BCM47XX_BOARD_LINKSYS_WRT310NV1:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
                 break;
-        case BCM47XX_BOARD_LINKSYS_WRT54G:
-                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54gsv1);
-                break;
         case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
                 break;
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101:
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467:
+        case BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708:
+                bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g_generic);
+                break;
         case BCM47XX_BOARD_LINKSYS_WRT610NV1:
                 bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt610nv1);
                 break;
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
index 0c3c8993567d..1f5643b89a91 100644
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
@@ -71,7 +71,9 @@ enum bcm47xx_board {
         BCM47XX_BOARD_LINKSYS_WRT310NV1,
         BCM47XX_BOARD_LINKSYS_WRT310NV2,
         BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
-        BCM47XX_BOARD_LINKSYS_WRT54G,
+        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
+        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
+        BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0708,
         BCM47XX_BOARD_LINKSYS_WRT610NV1,
         BCM47XX_BOARD_LINKSYS_WRT610NV2,
         BCM47XX_BOARD_LINKSYS_WRTSL54GS,