brcm47xx: 3.10: update MIPS patches with versions sent upstream

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 41910

1 files changed, 170 insertions, 0 deletions

diff --git a/target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch b/target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch
new file mode 100644
index 0000000..eee4b04
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.10/146-MIPS-BCM47XX-add-Microsoft-MN-700-and-Asus-WL500G.patch
@@ -0,0 +1,170 @@
+From 250dc03727b9cce91bd86091f05bf2443e2be9ec Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Tue, 29 Jul 2014 00:12:09 +0200
+Subject: [PATCH] MIPS: BCM47XX: add Microsoft MN-700 and Asus WL500G
+
+This patch adds detection for the Microsoft MN-700 and the Asus WL500G
+router. This is based on some old code from OpenWrt.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Cc: zajec5@gmail.com
+Cc: linux-mips@linux-mips.org
+Patchwork: https://patchwork.linux-mips.org/patch/7490/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ 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
+@@ -79,6 +79,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 = {
+@@ -236,6 +244,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
+@@ -395,6 +407,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;
+@@ -517,6 +532,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
+@@ -64,6 +64,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),
+ };
+@@ -332,6 +337,13 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
+ 	BCM47XX_GPIO_LED(7, "unk", "dmz", 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
+@@ -432,6 +444,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;
+@@ -554,6 +569,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,
+@@ -75,6 +76,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,