diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-02-23 15:57:37 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-02-23 15:57:37 +0000 |
| commit | 271866d423f925b0c716b15a2e6b2a98532738ba (patch) | |
| tree | 9304e6e39da9b8d96058019cd7069bc67e24a99f /target | |
| parent | 251b38dc8b7140b7f5099ef63effecca02a9fb82 (diff) | |
| download | master-187ad058-271866d423f925b0c716b15a2e6b2a98532738ba.tar.gz master-187ad058-271866d423f925b0c716b15a2e6b2a98532738ba.tar.bz2 master-187ad058-271866d423f925b0c716b15a2e6b2a98532738ba.zip | |
brcm47xx: fix detection of some Linksys WRT54G* devices
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39718 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
3 files changed, 45 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/139-MIPS-BCM47XX-detect-more-linksys-devices.patch b/target/linux/brcm47xx/patches-3.10/139-MIPS-BCM47XX-detect-more-linksys-devices.patch new file mode 100644 index 0000000000..ecb6316b76 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/139-MIPS-BCM47XX-detect-more-linksys-devices.patch @@ -0,0 +1,39 @@ +From b09189336f6d974c554aed03b4651e9f68ce0abd Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Sun, 23 Feb 2014 16:38:29 +0100 +Subject: [PATCH 3/6] MIPS: BCM47XX: detect some more Linksys devices + +The Linksys WRT54G/GS/GL family uses the same boardtype numbers, and +the same gpio configuration. The boardtype numbers are changing with +the hardware versions, but these hardware numbers are different or each +model. +Detect them all as one device, this also worked in OpenWrt. +--- + arch/mips/bcm47xx/board.c | 4 +++- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 2 +- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/arch/mips/bcm47xx/board.c ++++ b/arch/mips/bcm47xx/board.c +@@ -175,7 +175,9 @@ struct bcm47xx_board_type_list3 bcm47xx_ + {{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_WRT54GSV1, "Linksys WRT54GS V1"}, "0x0101", "42", "0x10"}, ++ {{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"}, + { {0}, NULL}, + }; + +--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h ++++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h +@@ -66,7 +66,7 @@ enum bcm47xx_board { + BCM47XX_BOARD_LINKSYS_WRT310NV1, + BCM47XX_BOARD_LINKSYS_WRT310NV2, + BCM47XX_BOARD_LINKSYS_WRT54G3GV2, +- BCM47XX_BOARD_LINKSYS_WRT54GSV1, ++ BCM47XX_BOARD_LINKSYS_WRT54G, + BCM47XX_BOARD_LINKSYS_WRT610NV1, + BCM47XX_BOARD_LINKSYS_WRT610NV2, + BCM47XX_BOARD_LINKSYS_WRTSL54GS, diff --git a/target/linux/brcm47xx/patches-3.10/140-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch b/target/linux/brcm47xx/patches-3.10/140-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch index 845d071192..94ead79896 100644 --- a/target/linux/brcm47xx/patches-3.10/140-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch +++ b/target/linux/brcm47xx/patches-3.10/140-MIPS-BCM47XX-add-button-and-led-configuration-for-so.patch @@ -1,7 +1,7 @@ -From 9894af92816e729162812f2554c9d97578138834 Mon Sep 17 00:00:00 2001 +From e3d15471f1be2bd2fd4db82907ad4b2d74ec2636 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens <hauke@hauke-m.de> Date: Fri, 10 Jan 2014 23:55:28 +0100 -Subject: [PATCH 1/2] MIPS: BCM47XX: add button and led configuration for some +Subject: [PATCH 4/6] MIPS: BCM47XX: add button and led configuration for some Linksys devices This adds led and button GPIO configuration for Linksys wrt54g3gv2, @@ -51,7 +51,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> case BCM47XX_BOARD_LINKSYS_WRT310NV1: err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1); break; -+ case BCM47XX_BOARD_LINKSYS_WRT54GSV1: ++ case BCM47XX_BOARD_LINKSYS_WRT54G: + err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54gsv1); + break; + case BCM47XX_BOARD_LINKSYS_WRT54G3GV2: @@ -113,7 +113,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> case BCM47XX_BOARD_LINKSYS_WRT310NV1: bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1); break; -+ case BCM47XX_BOARD_LINKSYS_WRT54GSV1: ++ case BCM47XX_BOARD_LINKSYS_WRT54G: + bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54gsv1); + break; + case BCM47XX_BOARD_LINKSYS_WRT54G3GV2: diff --git a/target/linux/brcm47xx/patches-3.10/141-MIPS-BCM47XX-add-detection-and-GPIO-config-for-Sieme.patch b/target/linux/brcm47xx/patches-3.10/141-MIPS-BCM47XX-add-detection-and-GPIO-config-for-Sieme.patch index 2c2cfdad77..9d19d41c36 100644 --- a/target/linux/brcm47xx/patches-3.10/141-MIPS-BCM47XX-add-detection-and-GPIO-config-for-Sieme.patch +++ b/target/linux/brcm47xx/patches-3.10/141-MIPS-BCM47XX-add-detection-and-GPIO-config-for-Sieme.patch @@ -17,7 +17,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c -@@ -179,6 +179,13 @@ struct bcm47xx_board_type_list3 bcm47xx_ +@@ -181,6 +181,13 @@ struct bcm47xx_board_type_list3 bcm47xx_ { {0}, NULL}, }; @@ -31,7 +31,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> static const struct bcm47xx_board_type bcm47xx_board_unknown[] __initconst = { {BCM47XX_BOARD_UNKNOWN, "Unknown Board"}, -@@ -272,6 +279,16 @@ static __init const struct bcm47xx_board +@@ -274,6 +281,16 @@ static __init const struct bcm47xx_board return &e3->board; } } |