brcm47xx: improve board detection for some devices

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41662

3 files changed, 210 insertions, 0 deletions

diff --git a/target/linux/brcm47xx/patches-3.14/147-MIPS-BCM47XX-fix-detection-of-Asus-RT-N10D.patch b/target/linux/brcm47xx/patches-3.14/147-MIPS-BCM47XX-fix-detection-of-Asus-RT-N10D.patch
new file mode 100644
index 0000000000..33ec5c55e3
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.14/147-MIPS-BCM47XX-fix-detection-of-Asus-RT-N10D.patch
@@ -0,0 +1,22 @@
+From 3d0704e7d371ea3ea5c8fe5bd796f5f15d44da59 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sat, 12 Jul 2014 18:01:32 +0200
+Subject: [PATCH 3/5] MIPS: BCM47XX: fix detection of Asus RT-N10D
+
+Sometimes we do not have a productid, but only a hardware_version.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/bcm47xx/board.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/mips/bcm47xx/board.c
++++ b/arch/mips/bcm47xx/board.c
+@@ -58,6 +58,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
+ static const
+ struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initconst = {
+ 	{{BCM47XX_BOARD_ASUS_RTN10U, "Asus RT-N10U"}, "RTN10U"},
++	{{BCM47XX_BOARD_ASUS_RTN10D, "Asus RT-N10D"}, "RTN10D"},
+ 	{{BCM47XX_BOARD_ASUS_RTN12, "Asus RT-N12"}, "RT-N12"},
+ 	{{BCM47XX_BOARD_ASUS_RTN12B1, "Asus RT-N12B1"}, "RTN12B1"},
+ 	{{BCM47XX_BOARD_ASUS_RTN12C1, "Asus RT-N12C1"}, "RTN12C1"},
diff --git a/target/linux/brcm47xx/patches-3.14/148-MIPS-BCM47XX-fix-name-of-Dell-TrueMobile-2300.patch b/target/linux/brcm47xx/patches-3.14/148-MIPS-BCM47XX-fix-name-of-Dell-TrueMobile-2300.patch
new file mode 100644
index 0000000000..4e7e411803
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.14/148-MIPS-BCM47XX-fix-name-of-Dell-TrueMobile-2300.patch
@@ -0,0 +1,23 @@
+From 9ccf31da4cac8fdb58d3d47f21b9fc7d2857026d Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Mon, 14 Jul 2014 23:15:32 +0200
+Subject: [PATCH 4/5] MIPS: BCM47XX: fix name of Dell TrueMobile 2300
+
+This looks like a copy and paste error in the initial version.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/bcm47xx/board.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/bcm47xx/board.c
++++ b/arch/mips/bcm47xx/board.c
+@@ -99,7 +99,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
+ /* ModelId */
+ static const
+ struct bcm47xx_board_type_list1 bcm47xx_board_list_ModelId[] __initconst = {
+-	{{BCM47XX_BOARD_DELL_TM2300, "Dell WX-5565"}, "WX-5565"},
++	{{BCM47XX_BOARD_DELL_TM2300, "Dell TrueMobile 2300"}, "WX-5565"},
+ 	{{BCM47XX_BOARD_MOTOROLA_WE800G, "Motorola WE800G"}, "WE800G"},
+ 	{{BCM47XX_BOARD_MOTOROLA_WR850GP, "Motorola WR850GP"}, "WR850GP"},
+ 	{{BCM47XX_BOARD_MOTOROLA_WR850GV2V3, "Motorola WR850G"}, "WR850G"},
diff --git a/target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch b/target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch
new file mode 100644
index 0000000000..e1f92ffc59
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.14/149-MIPS-BCM47XX-add-some-more-devices.patch
@@ -0,0 +1,165 @@
+From 35661c37bde151764e8526e77d4e02ca77e19160 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Mon, 14 Jul 2014 23:32:10 +0200
+Subject: [PATCH 5/5] MIPS: BCM47XX: add some more devices
+
+This adds Microsoft MN-700 and Asus WL500G.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/bcm47xx/board.c                          | 17 +++++++++++++++++
+ arch/mips/bcm47xx/buttons.c                        | 19 +++++++++++++++++++
+ arch/mips/bcm47xx/leds.c                           | 19 +++++++++++++++++++
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h |  3 +++
+ 4 files changed, 58 insertions(+)
+
+--- a/arch/mips/bcm47xx/board.c
++++ b/arch/mips/bcm47xx/board.c
+@@ -81,6 +81,14 @@ struct bcm47xx_board_type_list1 bcm47xx_
+ 	{ {0}, NULL},
+ };
+ 
++/* hardware_version, boardnum */
++static const
++struct bcm47xx_board_type_list2 bcm47xx_board_list_hw_version_num[] __initconst = {
++	{{BCM47XX_BOARD_MICROSOFT_MN700, "Microsoft MN-700"}, "WL500-", "mn700"},
++	{{BCM47XX_BOARD_ASUS_WL500G, "Asus WL500G"}, "WL500-", "asusX"},
++	{ {0}, NULL},
++};
++
+ /* productid */
+ static const
+ struct bcm47xx_board_type_list1 bcm47xx_board_list_productid[] __initconst = {
+@@ -238,6 +246,15 @@ static __init const struct bcm47xx_board
+ 		}
+ 	}
+ 
++	if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 &&
++	    bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) {
++		for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) {
++			if (!strstarts(buf1, e2->value1) &&
++			    !strcmp(buf2, e2->value2))
++				return &e2->board;
++		}
++	}
++
+ 	if (bcm47xx_nvram_getenv("productid", buf1, sizeof(buf1)) >= 0) {
+ 		for (e1 = bcm47xx_board_list_productid; e1->value1; e1++) {
+ 			if (!strcmp(buf1, e1->value1))
+--- a/arch/mips/bcm47xx/buttons.c
++++ b/arch/mips/bcm47xx/buttons.c
+@@ -56,6 +56,11 @@ bcm47xx_buttons_asus_wl330ge[] __initcon
+ };
+ 
+ static const struct gpio_keys_button
++bcm47xx_buttons_asus_wl500g[] __initconst = {
++	BCM47XX_GPIO_KEY(6, KEY_RESTART),
++};
++			
++static const struct gpio_keys_button
+ bcm47xx_buttons_asus_wl500gd[] __initconst = {
+ 	BCM47XX_GPIO_KEY(6, KEY_RESTART),
+ };
+@@ -288,6 +293,13 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __in
+ 	BCM47XX_GPIO_KEY(6, KEY_RESTART),
+ };
+ 
++/* Microsoft */
++
++static const struct gpio_keys_button
++bcm47xx_buttons_microsoft_nm700[] __initconst = {
++	BCM47XX_GPIO_KEY(7, KEY_RESTART),
++};
++
+ /* Motorola */
+ 
+ static const struct gpio_keys_button
+@@ -401,6 +413,9 @@ int __init bcm47xx_buttons_register(void
+ 	case BCM47XX_BOARD_ASUS_WL330GE:
+ 		err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_wl330ge);
+ 		break;
++	case BCM47XX_BOARD_ASUS_WL500G:
++		err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_wl500g);
++		break;
+ 	case BCM47XX_BOARD_ASUS_WL500GD:
+ 		err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_wl500gd);
+ 		break;
+@@ -525,6 +540,10 @@ int __init bcm47xx_buttons_register(void
+ 		err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrtsl54gs);
+ 		break;
+ 
++	case BCM47XX_BOARD_MICROSOFT_MN700:
++		err = bcm47xx_copy_bdata(bcm47xx_buttons_microsoft_nm700);
++		break;
++
+ 	case BCM47XX_BOARD_MOTOROLA_WE800G:
+ 		err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_we800g);
+ 		break;
+--- a/arch/mips/bcm47xx/leds.c
++++ b/arch/mips/bcm47xx/leds.c
+@@ -73,6 +73,11 @@ bcm47xx_leds_asus_wl330ge[] __initconst
+ };
+ 
+ static const struct gpio_led
++bcm47xx_leds_asus_wl500g[] __initconst = {
++	BCM47XX_GPIO_LED(0, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
++};
++
++static const struct gpio_led
+ bcm47xx_leds_asus_wl500gd[] __initconst = {
+ 	BCM47XX_GPIO_LED(0, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
+ };
+@@ -348,6 +353,13 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
+ 	BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
+ };
+ 
++/* Microsoft */
++
++static const struct gpio_led
++bcm47xx_leds_microsoft_nm700[] __initconst = {
++	BCM47XX_GPIO_LED(6, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
++};
++
+ /* Motorola */
+ 
+ static const struct gpio_led
+@@ -460,6 +472,9 @@ void __init bcm47xx_leds_register(void)
+ 	case BCM47XX_BOARD_ASUS_WL330GE:
+ 		bcm47xx_set_pdata(bcm47xx_leds_asus_wl330ge);
+ 		break;
++	case BCM47XX_BOARD_ASUS_WL500G:
++		bcm47xx_set_pdata(bcm47xx_leds_asus_wl500g);
++		break;
+ 	case BCM47XX_BOARD_ASUS_WL500GD:
+ 		bcm47xx_set_pdata(bcm47xx_leds_asus_wl500gd);
+ 		break;
+@@ -586,6 +601,10 @@ void __init bcm47xx_leds_register(void)
+ 		bcm47xx_set_pdata(bcm47xx_leds_linksys_wrtsl54gs);
+ 		break;
+ 
++	case BCM47XX_BOARD_MICROSOFT_MN700:
++		bcm47xx_set_pdata(bcm47xx_leds_microsoft_nm700);
++		break;
++
+ 	case BCM47XX_BOARD_MOTOROLA_WE800G:
+ 		bcm47xx_set_pdata(bcm47xx_leds_motorola_we800g);
+ 		break;
+--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
++++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+@@ -18,6 +18,7 @@ enum bcm47xx_board {
+ 	BCM47XX_BOARD_ASUS_WL300G,
+ 	BCM47XX_BOARD_ASUS_WL320GE,
+ 	BCM47XX_BOARD_ASUS_WL330GE,
++	BCM47XX_BOARD_ASUS_WL500G,
+ 	BCM47XX_BOARD_ASUS_WL500GD,
+ 	BCM47XX_BOARD_ASUS_WL500GPV1,
+ 	BCM47XX_BOARD_ASUS_WL500GPV2,
+@@ -77,6 +78,8 @@ enum bcm47xx_board {
+ 	BCM47XX_BOARD_LINKSYS_WRT610NV2,
+ 	BCM47XX_BOARD_LINKSYS_WRTSL54GS,
+ 
++	BCM47XX_BOARD_MICROSOFT_MN700,
++
+ 	BCM47XX_BOARD_MOTOROLA_WE800G,
+ 	BCM47XX_BOARD_MOTOROLA_WR850GP,
+ 	BCM47XX_BOARD_MOTOROLA_WR850GV2V3,