X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.14%2F562-board_VR-3025u.patch;h=2c7d4e13958f10217002e87d9187793e4e6ccae8;hb=d8c4cc64ba6cabb2e3be28c7b4539a95115119ce;hp=183baa634acbca5a22b33b221d129abaee2babff;hpb=54271ac89eb5e59ad267ca25bc5fb555367e2d2d;p=15.05%2Fopenwrt.git

diff --git a/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
index 183baa634a..2c7d4e1395 100644
--- a/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
+++ b/target/linux/brcm63xx/patches-3.14/562-board_VR-3025u.patch
@@ -1,15 +1,25 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4500,6 +4500,98 @@ static struct board_info __initdata boar
+@@ -1864,6 +1864,60 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
++static struct sprom_fixup __initdata vr3025u_fixups[] = {
++	{ .offset = 97, .value = 0xfeb3 },
++	{ .offset = 98, .value = 0x1618 },
++	{ .offset = 99, .value = 0xfab0 },
++	{ .offset = 113, .value = 0xfed1 },
++	{ .offset = 114, .value = 0x1609 },
++	{ .offset = 115, .value = 0xfad9 },
++};
++
 +static struct board_info __initdata board_VR3025u = {
 +	.name					= "96368M-1541N",
 +	.expected_cpu_id		= 0x6368,
 +
 +	.has_uart0				= 1,
 +	.has_pci				= 1,
++	.use_fallback_sprom			= 1,
 +	.has_ohci0				= 1,
 +	.has_ehci0				= 1,
 +
@@ -39,67 +49,19 @@
 +		},
 +	},
 +
-+	.leds = {
-+		{
-+			.name		= "VR-3025u:green:dsl",
-+			.gpio		= 2,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025u:green:inet",
-+			.gpio		= 5,
-+		},
-+		{
-+			.name		= "VR-3025u:green:lan1",
-+			.gpio		= 6,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025u:green:lan2",
-+			.gpio		= 7,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025u:green:lan3",
-+			.gpio		= 8,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025u:green:lan4",
-+			.gpio		= 9,
-+			.active_low	= 1,
-+		},
-+		{
-+			.name		= "VR-3025u:green:power",
-+			.gpio		= 22,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "VR-3025u:red:power",
-+			.gpio		= 24,
-+		},
-+		{
-+			.name		= "VR-3025u: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,
++		.pci_dev			= 1,
++		.board_fixups			= vr3025u_fixups,
++		.num_board_fixups		= ARRAY_SIZE(vr3025u_fixups),
 +	},
 +};
 +
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -4975,6 +5067,7 @@ static const struct board_info __initcon
+@@ -2236,6 +2290,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -107,3 +69,11 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
+@@ -2322,6 +2377,7 @@ static struct of_device_id const bcm963x
+ #ifdef CONFIG_BCM63XX_CPU_6368
+ 	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+ 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
++	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
+ 	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
+ #endif
+ #ifdef CONFIG_BCM63XX_CPU_63268