From 8ef323302f93b40854fa628da94cc6c699732702 Mon Sep 17 00:00:00 2001
From: jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 4 Apr 2014 10:17:08 +0000
Subject: brcm63xx: update development kernel to linux 3.14

Now that 3.13 will be EOL soon, switch to 3.14.

Known issues:
 * 74x164 is not available because upstream dropped non-DT support
 * jffs2 breaks with SMP

Unknown issues:
 * probably plenty

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40380 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 ...X-remove-RUNTIME_DETECT-usage-from-enet-c.patch | 89 ++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 target/linux/brcm63xx/patches-3.14/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch

(limited to 'target/linux/brcm63xx/patches-3.14/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch')

diff --git a/target/linux/brcm63xx/patches-3.14/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch b/target/linux/brcm63xx/patches-3.14/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch
new file mode 100644
index 0000000000..0dba2e2f1e
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.14/315-MIPS-BCM63XX-remove-RUNTIME_DETECT-usage-from-enet-c.patch
@@ -0,0 +1,89 @@
+From ed6c71de07ad042691ec02e9eb97375ddc91ed01 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Tue, 3 Dec 2013 13:45:22 +0100
+Subject: [PATCH 6/8] MIPS: BCM63XX: remove !RUNTIME_DETECT usage from enet
+ code
+
+---
+ arch/mips/bcm63xx/dev-enet.c                       |  4 --
+ .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h    | 46 ----------------------
+ 2 files changed, 50 deletions(-)
+
+--- a/arch/mips/bcm63xx/dev-enet.c
++++ b/arch/mips/bcm63xx/dev-enet.c
+@@ -14,7 +14,6 @@
+ #include <bcm63xx_io.h>
+ #include <bcm63xx_regs.h>
+ 
+-#ifdef BCMCPU_RUNTIME_DETECT
+ static const unsigned long bcm6348_regs_enetdmac[] = {
+ 	[ENETDMAC_CHANCFG]	= ENETDMAC_CHANCFG_REG,
+ 	[ENETDMAC_IR]		= ENETDMAC_IR_REG,
+@@ -43,9 +42,6 @@ static __init void bcm63xx_enetdmac_regs
+ 	else
+ 		bcm63xx_regs_enetdmac = bcm6348_regs_enetdmac;
+ }
+-#else
+-static __init void bcm63xx_enetdmac_regs_init(void) { }
+-#endif
+ 
+ static struct resource shared_res[] = {
+ 	{
+--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h
+@@ -112,55 +112,9 @@ enum bcm63xx_regs_enetdmac {
+ 
+ static inline unsigned long bcm63xx_enetdmacreg(enum bcm63xx_regs_enetdmac reg)
+ {
+-#ifdef BCMCPU_RUNTIME_DETECT
+ 	extern const unsigned long *bcm63xx_regs_enetdmac;
+ 
+ 	return bcm63xx_regs_enetdmac[reg];
+-#else
+-#ifdef CONFIG_BCM63XX_CPU_6345
+-	switch (reg) {
+-	case ENETDMAC_CHANCFG:
+-		return ENETDMA_6345_CHANCFG_REG;
+-	case ENETDMAC_IR:
+-		return ENETDMA_6345_IR_REG;
+-	case ENETDMAC_IRMASK:
+-		return ENETDMA_6345_IRMASK_REG;
+-	case ENETDMAC_MAXBURST:
+-		return ENETDMA_6345_MAXBURST_REG;
+-	case ENETDMAC_BUFALLOC:
+-		return ENETDMA_6345_BUFALLOC_REG;
+-	case ENETDMAC_RSTART:
+-		return ENETDMA_6345_RSTART_REG;
+-	case ENETDMAC_FC:
+-		return ENETDMA_6345_FC_REG;
+-	case ENETDMAC_LEN:
+-		return ENETDMA_6345_LEN_REG;
+-	}
+-#endif
+-#if defined(CONFIG_BCM63XX_CPU_6328) || \
+-	defined(CONFIG_BCM63XX_CPU_6338) || \
+-	defined(CONFIG_BCM63XX_CPU_6348) || \
+-	defined(CONFIG_BCM63XX_CPU_6358) || \
+-	defined(CONFIG_BCM63XX_CPU_6362) || \
+-	defined(CONFIG_BCM63XX_CPU_6368)
+-	switch (reg) {
+-	case ENETDMAC_CHANCFG:
+-		return ENETDMAC_CHANCFG_REG;
+-	case ENETDMAC_IR:
+-		return ENETDMAC_IR_REG;
+-	case ENETDMAC_IRMASK:
+-		return ENETDMAC_IRMASK_REG;
+-	case ENETDMAC_MAXBURST:
+-		return ENETDMAC_MAXBURST_REG;
+-	case ENETDMAC_BUFALLOC:
+-	case ENETDMAC_RSTART:
+-	case ENETDMAC_FC:
+-	case ENETDMAC_LEN:
+-		return 0;
+-	}
+-#endif
+-#endif
+-	return 0;
+ }
+ 
+ 
-- 
cgit v1.2.3