X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F534-board_hw556.patch;h=f1664a476eafa69734a520c764dcca5918fac088;hb=8e04efe3e59dcf31a7ab62ef613b77d8d00af122;hp=29f3d7c5aad7fc22b6315b6f45d12f0335ca48da;hpb=45483c053599895cb6dad514a49f1af719b622c9;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
index 29f3d7c5aa..f1664a476e 100644
--- a/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-3.14/534-board_hw556.patch
@@ -6,15 +6,14 @@
  #include <linux/input.h>
 +#include <linux/pci_ids.h>
  #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_gpio.h>
-@@ -2676,6 +2677,405 @@ static struct board_info __initdata boar
+ #include <linux/rtl8367.h>
+ #include <asm/addrspace.h>
+@@ -1547,6 +1548,93 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_HW556_C = {
 +	.name					= "HW556_C",
-+	.of_board_id				= "huawei,hg556a-c",
 +	.expected_cpu_id			= 0x6358,
 +
 +	.has_uart0				= 1,
@@ -40,109 +39,9 @@
 +		.force_speed_100		= 1,
 +		.force_duplex_full		= 1,
 +	},
-+
-+	.leds = {
-+		{
-+			.name			= "HW556:green:lan1",
-+			.gpio			= 0,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan2",
-+			.gpio			= 1,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:dsl",
-+			.gpio			= 2,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:power",
-+			.gpio			= 3,
-+			.active_low		= 1,
-+			.default_trigger	= "default-on",
-+		},
-+		{
-+			.name			= "HW556:red:message",
-+			.gpio			= 12,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan1",
-+			.gpio			= 13,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:hspa",
-+			.gpio			= 15,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan2",
-+			.gpio			= 22,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan3",
-+			.gpio			= 23,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan3",
-+			.gpio			= 26,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan4",
-+			.gpio			= 27,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan4",
-+			.gpio			= 28,
-+			.active_low		= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc			= "help",
-+			.gpio			= 8,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_HELP,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "wlan",
-+			.gpio			= 9,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_WLAN,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "restart",
-+			.gpio			= 10,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_RESTART,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "reset",
-+			.gpio			= 11,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_CONFIG,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
 +};
 +static struct board_info __initdata board_HW556_A = {
 +	.name					= "HW556_A",
-+	.of_board_id				= "huawei,hg556a-a",
 +	.expected_cpu_id			= 0x6358,
 +
 +	.has_uart0				= 1,
@@ -169,115 +68,9 @@
 +		.force_speed_100		= 1,
 +		.force_duplex_full		= 1,
 +	},
-+
-+	.leds = {
-+		{
-+			.name			= "HW556:red:message",
-+			.gpio			= 0,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:hspa",
-+			.gpio			= 1,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:dsl",
-+			.gpio			= 2,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:power",
-+			.gpio			= 3,
-+			.active_low		= 1,
-+			.default_trigger	= "default-on",
-+		},
-+		{
-+			.name			= "HW556:red:all",
-+			.gpio			= 6,
-+			.active_low		= 1,
-+			.default_trigger	= "default-on",
-+		},
-+		{
-+			.name			= "HW556:green:lan1",
-+			.gpio			= 12,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan1",
-+			.gpio			= 13,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan2",
-+			.gpio			= 15,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan2",
-+			.gpio			= 22,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan3",
-+			.gpio			= 23,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan3",
-+			.gpio			= 26,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan4",
-+			.gpio			= 27,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan4",
-+			.gpio			= 28,
-+			.active_low		= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc			= "help",
-+			.gpio			= 8,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_HELP,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "wlan",
-+			.gpio			= 9,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_WLAN,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "restart",
-+			.gpio			= 10,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_RESTART,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "reset",
-+			.gpio			= 11,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_CONFIG,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
 +};
 +static struct board_info __initdata board_HW556_B = {
 +	.name					= "HW556_B",
-+	.of_board_id				= "huawei,hg556a-b",
 +	.expected_cpu_id			= 0x6358,
 +
 +	.has_uart0				= 1,
@@ -304,117 +97,12 @@
 +		.force_speed_100		= 1,
 +		.force_duplex_full		= 1,
 +	},
-+
-+	.leds = {
-+		{
-+			.name			= "HW556:red:message",
-+			.gpio			= 0,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:hspa",
-+			.gpio			= 1,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:dsl",
-+			.gpio			= 2,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:power",
-+			.gpio			= 3,
-+			.active_low		= 1,
-+			.default_trigger	= "default-on",
-+		},
-+		{
-+			.name			= "HW556:red:all",
-+			.gpio			= 6,
-+			.active_low		= 1,
-+			.default_trigger	= "default-on",
-+		},
-+		{
-+			.name			= "HW556:green:lan1",
-+			.gpio			= 12,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan1",
-+			.gpio			= 13,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan2",
-+			.gpio			= 15,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan2",
-+			.gpio			= 22,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan3",
-+			.gpio			= 23,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan3",
-+			.gpio			= 26,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:green:lan4",
-+			.gpio			= 27,
-+			.active_low		= 1,
-+		},
-+		{
-+			.name			= "HW556:red:lan4",
-+			.gpio			= 28,
-+			.active_low		= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc			= "help",
-+			.gpio			= 8,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_HELP,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "wlan",
-+			.gpio			= 9,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_WLAN,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "restart",
-+			.gpio			= 10,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_RESTART,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc			= "reset",
-+			.gpio			= 11,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_CONFIG,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
 +};
 +
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
  	.name			= "96358-502V",
-@@ -3114,6 +3514,9 @@ static const struct board_info __initcon
+@@ -1808,6 +1896,9 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
  	&board_HW553,
@@ -424,3 +112,13 @@
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif
+@@ -1874,6 +1965,9 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
+ 	{ .compatible = "d-link,dva-g3810bn/tl", .data = &board_DVAG3810BN, },
+ 	{ .compatible = "huawei,hg553", .data = &board_HW553, },
++	{ .compatible = "huawei,hg556a-a", .data = &board_HW556_A, },
++	{ .compatible = "huawei,hg556a-b", .data = &board_HW556_B, },
++	{ .compatible = "huawei,hg556a-c", .data = &board_HW556_C, },
+ 	{ .compatible = "pirelli,a226g", .data = &board_DWVS0, },
+ 	{ .compatible = "pirelli,a226m", .data = &board_DWVS0, },
+ 	{ .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, },