From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 ...MIPS-BCM63XX-make-fallback-sprom-optional.patch | 140 +++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 target/linux/brcm63xx/patches-3.18/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch

(limited to 'target/linux/brcm63xx/patches-3.18/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch')

diff --git a/target/linux/brcm63xx/patches-3.18/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/brcm63xx/patches-3.18/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch
new file mode 100644
index 0000000..d7250d5
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.18/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch
@@ -0,0 +1,140 @@
+From 83131acbfb59760a19f3711c09526e191c8aad54 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Tue, 29 Jul 2014 21:52:56 +0200
+Subject: [PATCH 03/10] MIPS: BCM63XX: make fallback sprom optional
+
+Some devices do not provide enough mac addresses to populate wifi in
+addition to ethernet.
+
+Use having pci enabled as a rough heuristic which boards should have it
+enabled.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c           | 12 ++++++++++++
+ arch/mips/bcm63xx/boards/board_common.c             |  5 +++--
+ arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |  1 +
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -74,6 +74,7 @@ static struct board_info __initdata boar
+ 	.has_uart0			= 1,
+ 	.has_pci			= 1,
+ 	.has_usbd			= 0,
++	.use_fallback_sprom		= 1,
+ 
+ 	.usbd = {
+ 		.use_fullspeed		= 0,
+@@ -223,6 +224,7 @@ static struct board_info __initdata boar
+ 	.has_uart0			= 1,
+ 	.has_enet0			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -268,6 +270,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -328,6 +331,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -382,6 +386,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -440,6 +445,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -463,6 +469,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -481,6 +488,7 @@ static struct board_info __initdata boar
+ 
+ 	.has_uart0			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 	.has_ohci0			= 1,
+ 
+ 	.has_enet0			= 1,
+@@ -503,6 +511,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -529,6 +538,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -581,6 +591,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+@@ -652,6 +663,7 @@ static struct board_info __initdata boar
+ 	.has_enet0			= 1,
+ 	.has_enet1			= 1,
+ 	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
+ 
+ 	.enet0 = {
+ 		.has_phy		= 1,
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -202,8 +202,9 @@ int __init board_register_devices(void)
+ 	 * do this after registering enet devices
+ 	 */
+ 
+-	if (board_get_mac_address(board.fallback_sprom.mac_addr) ||
+-	    bcm63xx_register_fallback_sprom(&board.fallback_sprom))
++	if (board.use_fallback_sprom &&
++	    (board_get_mac_address(board.fallback_sprom.mac_addr) ||
++	     bcm63xx_register_fallback_sprom(&board.fallback_sprom)))
+ 		pr_err(PFX "failed to register fallback SPROM\n");
+ 
+ 	bcm63xx_spi_register();
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -35,6 +35,7 @@ struct board_info {
+ 	unsigned int	has_dsp:1;
+ 	unsigned int	has_uart0:1;
+ 	unsigned int	has_uart1:1;
++	unsigned int	use_fallback_sprom:1;
+ 
+ 	/* ethernet config */
+ 	struct bcm63xx_enet_platform_data enet0;
-- 
cgit v1.2.3