From d3af37fdfb6caff23e0265b1d6b4415709a32e06 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 10 Aug 2014 12:22:05 +0000
Subject: [PATCH] brcm63xx: Add fallback sprom for VR-3025u
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

SVN-Revision: 42106
---
 .../patches-3.14/562-board_VR-3025u.patch     | 22 +++++++++++++++++--
 .../patches-3.14/563-board_VR-3025un.patch    |  4 ++--
 .../564-board_P870HW-51a_v2.patch             |  6 ++---
 .../patches-3.14/565-board_hw520.patch        |  2 +-
 .../patches-3.14/566-board_A4001N.patch       |  2 +-
 .../patches-3.14/567-board_dsl-2751b_e1.patch |  2 +-
 6 files changed, 28 insertions(+), 10 deletions(-)

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 f0f7dab614..67f99dcad9 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
-@@ -4561,6 +4561,98 @@ static struct board_info __initdata boar
+@@ -4561,6 +4561,116 @@ 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,
 +
@@ -94,12 +104,20 @@
 +			.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",
  };
-@@ -5054,6 +5146,7 @@ static const struct board_info __initcon
+@@ -5054,6 +5164,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
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 890ce02da7..a257523eb7 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
-@@ -4653,6 +4653,98 @@ static struct board_info __initdata boar
+@@ -4671,6 +4671,98 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -99,7 +99,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -5147,6 +5239,7 @@ static const struct board_info __initcon
+@@ -5165,6 +5257,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_VR3025u,
diff --git a/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
index 16d3f64527..3c4f4c8f57 100644
--- a/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
+++ b/target/linux/brcm63xx/patches-3.14/564-board_P870HW-51a_v2.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4561,6 +4561,89 @@ static struct board_info __initdata boar
- 	.has_ehci0 = 1,
+@@ -4570,6 +4570,89 @@ static struct sprom_fixup __initdata vr3
+ 	{ .offset = 115, .value = 0xfad9 },
  };
  
 +static struct board_info __initdata board_P870HW51A_V2 = {
@@ -90,7 +90,7 @@
  static struct board_info __initdata board_VR3025u = {
  	.name					= "96368M-1541N",
  	.expected_cpu_id		= 0x6368,
-@@ -5238,6 +5321,7 @@ static const struct board_info __initcon
+@@ -5256,6 +5339,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
diff --git a/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch b/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
index f5fd41e4ae..b0db2cb621 100644
--- a/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
+++ b/target/linux/brcm63xx/patches-3.14/565-board_hw520.patch
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -5304,6 +5347,7 @@ static const struct board_info __initcon
+@@ -5322,6 +5365,7 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_nb4_fxc_r2,
  	&board_ct6373_1,
diff --git a/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch b/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
index cd517339bb..2ce2feaa67 100644
--- a/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
+++ b/target/linux/brcm63xx/patches-3.14/566-board_A4001N.patch
@@ -89,7 +89,7 @@
  static struct board_info __initdata board_A4001N1 = {
  	.name					= "963281T_TEF",
  	.expected_cpu_id			= 0x6328,
-@@ -5295,6 +5377,7 @@ static const struct board_info __initcon
+@@ -5313,6 +5395,7 @@ static const struct board_info __initcon
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
diff --git a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch
index 6474e9afaf..8c7ea5e5fb 100644
--- a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch
+++ b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch
@@ -142,7 +142,7 @@
  #endif
  
  /*
-@@ -5371,6 +5506,7 @@ static const struct board_info __initcon
+@@ -5389,6 +5524,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
-- 
GitLab