From: Jonas Gorski <jogo@openwrt.org>
Date: Sat, 12 Jul 2014 12:31:33 +0000 (+0000)
Subject: brcm63xx: Use model name for Comtrend AR-5387un
X-Git-Tag: reboot~6581
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c9b2e96909cb89f8bd91ef13ab7f89799783ae3b;p=openwrt%2Fstaging%2Flynxis.git

brcm63xx: Use model name for Comtrend AR-5387un

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 41586
---

diff --git a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
index afacffcd9a..be381c2042 100755
--- a/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
+++ b/target/linux/brcm63xx/base-files/lib/brcm63xx.sh
@@ -45,7 +45,7 @@ brcm63xx_detect() {
 		;;
 	96328A-1441N1)
 		brcm63xx_has_reset_button="true"
-		status_led="96328A-1441N1:green:power"
+		status_led="AR-5387un:green:power"
 		ifname=eth0
 		;;
 	963281TAN)
diff --git a/target/linux/brcm63xx/image/Makefile b/target/linux/brcm63xx/image/Makefile
index 711c80219a..a4108483cc 100755
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -169,7 +169,6 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),96328avng,6328,96328avng-8M-flash-generic,,--pad 4)
 	$(call Image/Build/CFE,$(1),96328avng,6328,96328avng-16M-flash-generic,,--pad 8)
 	$(call Image/Build/CFE,$(1),96328A-1241N,6328,96328A-1241N-generic,,--pad 8)
-	$(call Image/Build/CFE,$(1),96328A-1441N1,6328,96328A-1441N1-generic,,--pad 8)
 	$(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-4M-flash-generic,,--pad 2)
 	$(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-8M-flash-generic,,--pad 4)
 	$(call Image/Build/CFE,$(1),963281TAN,6328,963281TAN-16M-flash-generic,,--pad 8)
@@ -228,6 +227,8 @@ define Image/Build
 	$(call Image/Build/CFE,$(1),CT6373-1,6358,CT6373)
 	# Comtrend 536, 5621
 	$(call Image/Build/CFEFIXUP,$(1),96348GW-11,CT536_CT5621,6348,CT536_CT5621)
+	# Comtrend AR-5387un
+	$(call Image/Build/CFE,$(1),96328A-1441N1,6328,AR-5387un,,--pad 8)
 	# Comtrend WAP-5813n
 	$(call Image/Build/CFE,$(1),96369R-1231N,6368,WAP-5813n,,--pad 4)
 	# Davolink DV201AMR
diff --git a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
deleted file mode 100644
index 8c67994e6b..0000000000
--- a/target/linux/brcm63xx/patches-3.10/531-board_96328A-1441N1.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -165,6 +165,79 @@ static struct board_info __initdata boar
- 	},
- };
- 
-+static struct board_info __initdata board_96328A_1441N1 = {
-+	.name					= "96328A-1441N1",
-+	.expected_cpu_id			= 0x6328,
-+
-+	.has_uart0				= 1,
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
-+
-+	.enetsw = {
-+		.used_ports = {
-+			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
-+			},
-+			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
-+			},
-+			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
-+			},
-+			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
-+			},
-+		},
-+	},
-+
-+	.leds = {
-+		{
-+			.name			= "96328A-1441N1:green:power",
-+			.gpio			= 8,
-+			.default_trigger	= "default-on",
-+		},
-+		{
-+			.name			= "96328A-1441N1:red:power",
-+			.gpio			= 4,
-+		},
-+		{
-+			.name			= "96328A-1441N1:green:inet",
-+			.gpio			= 7,
-+		},
-+		{
-+			.name			= "96328A-1441N1:red:inet",
-+			.gpio			= 1,
-+		},
-+		{
-+			.name			= "96328A-1441N1:green:dsl",
-+			.gpio			= 11,
-+			.active_low		= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc			= "reset",
-+			.gpio			= 23,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_RESTART,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
-+};
-+
- static struct board_info __initdata board_963281TAN = {
- 	.name				= "963281TAN",
- 	.expected_cpu_id		= 0x6328,
-@@ -3079,6 +3152,7 @@ static const struct board_info __initcon
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6328
- 	&board_96328avng,
-+	&board_96328A_1441N1,
- 	&board_963281TAN,
- 	&board_A4001N1,
- 	&board_dsl_274xb_f1,
diff --git a/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch
new file mode 100644
index 0000000000..08062751e8
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.10/531-board_AR-5387un.patch
@@ -0,0 +1,90 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -165,6 +165,79 @@ static struct board_info __initdata boar
+ 	},
+ };
+ 
++static struct board_info __initdata board_AR5387un = {
++	.name					= "96328A-1441N1",
++	.expected_cpu_id			= 0x6328,
++
++	.has_uart0				= 1,
++	.has_pci				= 1,
++	.has_ohci0				= 1,
++	.has_ehci0				= 1,
++	.num_usbh_ports				= 1,
++	.has_enetsw				= 1,
++
++	.enetsw = {
++		.used_ports = {
++			[0] = {
++				.used		= 1,
++				.phy_id		= 1,
++				.name		= "Port 1",
++			},
++			[1] = {
++				.used		= 1,
++				.phy_id		= 2,
++				.name		= "Port 2",
++			},
++			[2] = {
++				.used		= 1,
++				.phy_id		= 3,
++				.name		= "Port 3",
++			},
++			[3] = {
++				.used		= 1,
++				.phy_id		= 4,
++				.name		= "Port 4",
++			},
++		},
++	},
++
++	.leds = {
++		{
++			.name			= "AR-5387un:green:power",
++			.gpio			= 8,
++			.default_trigger	= "default-on",
++		},
++		{
++			.name			= "AR-5387un:red:power",
++			.gpio			= 4,
++		},
++		{
++			.name			= "AR-5387un:green:inet",
++			.gpio			= 7,
++		},
++		{
++			.name			= "AR-5387un:red:inet",
++			.gpio			= 1,
++		},
++		{
++			.name			= "AR-5387un:green:dsl",
++			.gpio			= 11,
++			.active_low		= 1,
++		},
++	},
++
++	.buttons = {
++		{
++			.desc			= "reset",
++			.gpio			= 23,
++			.active_low		= 1,
++			.type			= EV_KEY,
++			.code			= KEY_RESTART,
++			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++		},
++	},
++};
++
+ static struct board_info __initdata board_963281TAN = {
+ 	.name				= "963281TAN",
+ 	.expected_cpu_id		= 0x6328,
+@@ -3079,6 +3152,7 @@ static const struct board_info __initcon
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6328
+ 	&board_96328avng,
++	&board_AR5387un,
+ 	&board_963281TAN,
+ 	&board_A4001N1,
+ 	&board_dsl_274xb_f1,
diff --git a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
index 6866c84f08..bcbf50a843 100644
--- a/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
+++ b/target/linux/brcm63xx/patches-3.10/532-board_96328a-1241N.patch
@@ -71,7 +71,7 @@
 +	},
 +};
 +
- static struct board_info __initdata board_96328A_1441N1 = {
+ static struct board_info __initdata board_AR5387un = {
  	.name					= "96328A-1441N1",
  	.expected_cpu_id			= 0x6328,
 @@ -3152,6 +3219,7 @@ static const struct board_info __initcon
@@ -79,6 +79,6 @@
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_96328A_1241N,
- 	&board_96328A_1441N1,
+ 	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,
diff --git a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch b/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch
deleted file mode 100644
index ad1f50b42f..0000000000
--- a/target/linux/brcm63xx/patches-3.14/531-board_96328A-1441N1.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -167,6 +167,79 @@ static struct board_info __initdata boar
- 	},
- };
- 
-+static struct board_info __initdata board_96328A_1441N1 = {
-+	.name					= "96328A-1441N1",
-+	.expected_cpu_id			= 0x6328,
-+
-+	.has_uart0				= 1,
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
-+
-+	.enetsw = {
-+		.used_ports = {
-+			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
-+			},
-+			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
-+			},
-+			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
-+			},
-+			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
-+			},
-+		},
-+	},
-+
-+	.leds = {
-+		{
-+			.name			= "96328A-1441N1:green:power",
-+			.gpio			= 8,
-+			.default_trigger	= "default-on",
-+		},
-+		{
-+			.name			= "96328A-1441N1:red:power",
-+			.gpio			= 4,
-+		},
-+		{
-+			.name			= "96328A-1441N1:green:inet",
-+			.gpio			= 7,
-+		},
-+		{
-+			.name			= "96328A-1441N1:red:inet",
-+			.gpio			= 1,
-+		},
-+		{
-+			.name			= "96328A-1441N1:green:dsl",
-+			.gpio			= 11,
-+			.active_low		= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc			= "reset",
-+			.gpio			= 23,
-+			.active_low		= 1,
-+			.type			= EV_KEY,
-+			.code			= KEY_RESTART,
-+			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
-+};
-+
- static struct board_info __initdata board_963281TAN = {
- 	.name				= "963281TAN",
- 	.expected_cpu_id		= 0x6328,
-@@ -3089,6 +3162,7 @@ static const struct board_info __initcon
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6328
- 	&board_96328avng,
-+	&board_96328A_1441N1,
- 	&board_963281TAN,
- 	&board_A4001N1,
- 	&board_dsl_274xb_f1,
diff --git a/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
new file mode 100644
index 0000000000..c62b5dd027
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.14/531-board_AR-5387un.patch
@@ -0,0 +1,90 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -167,6 +167,79 @@ static struct board_info __initdata boar
+ 	},
+ };
+ 
++static struct board_info __initdata board_AR5387un = {
++	.name					= "96328A-1441N1",
++	.expected_cpu_id			= 0x6328,
++
++	.has_uart0				= 1,
++	.has_pci				= 1,
++	.has_ohci0				= 1,
++	.has_ehci0				= 1,
++	.num_usbh_ports				= 1,
++	.has_enetsw				= 1,
++
++	.enetsw = {
++		.used_ports = {
++			[0] = {
++				.used		= 1,
++				.phy_id		= 1,
++				.name		= "Port 1",
++			},
++			[1] = {
++				.used		= 1,
++				.phy_id		= 2,
++				.name		= "Port 2",
++			},
++			[2] = {
++				.used		= 1,
++				.phy_id		= 3,
++				.name		= "Port 3",
++			},
++			[3] = {
++				.used		= 1,
++				.phy_id		= 4,
++				.name		= "Port 4",
++			},
++		},
++	},
++
++	.leds = {
++		{
++			.name			= "AR-5387un:green:power",
++			.gpio			= 8,
++			.default_trigger	= "default-on",
++		},
++		{
++			.name			= "AR-5387un:red:power",
++			.gpio			= 4,
++		},
++		{
++			.name			= "AR-5387un:green:inet",
++			.gpio			= 7,
++		},
++		{
++			.name			= "AR-5387un:red:inet",
++			.gpio			= 1,
++		},
++		{
++			.name			= "AR-5387un:green:dsl",
++			.gpio			= 11,
++			.active_low		= 1,
++		},
++	},
++
++	.buttons = {
++		{
++			.desc			= "reset",
++			.gpio			= 23,
++			.active_low		= 1,
++			.type			= EV_KEY,
++			.code			= KEY_RESTART,
++			.debounce_interval	= BCM963XX_KEYS_DEBOUNCE_INTERVAL,
++		},
++	},
++};
++
+ static struct board_info __initdata board_963281TAN = {
+ 	.name				= "963281TAN",
+ 	.expected_cpu_id		= 0x6328,
+@@ -3089,6 +3162,7 @@ static const struct board_info __initcon
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_6328
+ 	&board_96328avng,
++	&board_AR5387un,
+ 	&board_963281TAN,
+ 	&board_A4001N1,
+ 	&board_dsl_274xb_f1,
diff --git a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch b/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch
index 1a9f3c977f..268acdcf4f 100644
--- a/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch
+++ b/target/linux/brcm63xx/patches-3.14/532-board_96328a-1241N.patch
@@ -71,7 +71,7 @@
 +	},
 +};
 +
- static struct board_info __initdata board_96328A_1441N1 = {
+ static struct board_info __initdata board_AR5387un = {
  	.name					= "96328A-1441N1",
  	.expected_cpu_id			= 0x6328,
 @@ -3162,6 +3229,7 @@ static const struct board_info __initcon
@@ -79,6 +79,6 @@
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_96328A_1241N,
- 	&board_96328A_1441N1,
+ 	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,