X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F563-board_VR-3025un.patch;h=610db1ea3726b93da743820efa905bca4743e136;hb=86a0913dd8dd17dfd1f4014d3e6238efe67ae8b9;hp=9b6457c689f21219cea9253976a5dfded729e7f7;hpb=ce675ff3ed2bc8358df40d2d4c79bd0a407c6864;p=openwrt.git

diff --git a/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
index 9b6457c689..610db1ea37 100644
--- a/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
+++ b/target/linux/brcm63xx/patches-3.14/563-board_VR-3025un.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4283,6 +4283,117 @@ static struct board_info __initdata boar
+@@ -1976,6 +1976,60 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -15,7 +15,6 @@
 +
 +static struct board_info __initdata board_VR3025un = {
 +	.name					= "96368M-1341N",
-+	.of_board_id			= "comtrend,vr-3025un",
 +	.expected_cpu_id		= 0x6368,
 +
 +	.has_uart0				= 1,
@@ -50,62 +49,6 @@
 +		},
 +	},
 +
-+	.leds = {
-+		{
-+			.name		= "VR-3025un:green:dsl",
-+			.gpio		= 2,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025un:green:inet",
-+			.gpio		= 5,
-+		},
-+		{
-+			.name		= "VR-3025un:green:lan1",
-+			.gpio		= 6,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025un:green:lan2",
-+			.gpio		= 7,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025un:green:lan3",
-+			.gpio		= 8,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025un:green:iptv",
-+			.gpio		= 9,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025un:green:power",
-+			.gpio		= 22,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "VR-3025un:red:power",
-+			.gpio		= 24,
-+		},
-+		{
-+			.name		= "VR-3025un:red:inet",
-+			.gpio		= 31,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc			= "reset",
-+			.gpio			= 34,
-+			.type			= EV_KEY,
-+			.code			= KEY_RESTART,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+			.active_low		= 1,
-+		},
-+	},
-+
 +	.fallback_sprom = {
 +		.type 				= SPROM_BCM43222,
 +		.pci_bus			= 0,
@@ -118,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -4774,6 +4885,7 @@ static const struct board_info __initcon
+@@ -2414,6 +2468,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_VR3025u,
@@ -126,3 +69,11 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
+@@ -2497,6 +2552,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+ 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
+ 	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
++	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
+ 	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268