diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-10-02 12:26:19 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-10-02 12:26:19 +0000 |
| commit | 60cb45427e68de3685387bddee6e5b6744da5452 (patch) | |
| tree | 3328b84e63a6a98fd6b395e46b5a13b6da1bf5dd /target/linux/brcm63xx/patches-3.14/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch | |
| parent | 57214b00aed49a43bf8070772d87663971b2af14 (diff) | |
| download | upstream-60cb45427e68de3685387bddee6e5b6744da5452.tar.gz upstream-60cb45427e68de3685387bddee6e5b6744da5452.tar.bz2 upstream-60cb45427e68de3685387bddee6e5b6744da5452.zip | |
brcm63xx: reorder some patches according to their upstream state
The irq rewrite was accepted upstream.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 42739
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch b/target/linux/brcm63xx/patches-3.14/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch deleted file mode 100644 index 04b34266b1..0000000000 --- a/target/linux/brcm63xx/patches-3.14/310-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-registe.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 082a49f0490008b999db80e3ccf1521c7dd21cec Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jogo@openwrt.org> -Date: Mon, 2 Dec 2013 12:32:44 +0100 -Subject: [PATCH 1/8] MIPS: BCM63XX: remove !RUNTIME_DETECT code from register - sets - -Signed-off-by: Jonas Gorski <jogo@openwrt.org> ---- - arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 33 ------------------------ - 1 file changed, 33 deletions(-) - ---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -598,10 +598,6 @@ enum bcm63xx_regs_set { - - extern const unsigned long *bcm63xx_regs_base; - --#define __GEN_RSET_BASE(__cpu, __rset) \ -- case RSET_## __rset : \ -- return BCM_## __cpu ##_## __rset ##_BASE; -- - #define __GEN_RSET(__cpu) \ - switch (set) { \ - __GEN_RSET_BASE(__cpu, DSL_LMEM) \ -@@ -693,36 +689,7 @@ extern const unsigned long *bcm63xx_regs - - static inline unsigned long bcm63xx_regset_address(enum bcm63xx_regs_set set) - { --#ifdef BCMCPU_RUNTIME_DETECT - return bcm63xx_regs_base[set]; --#else --#ifdef CONFIG_BCM63XX_CPU_3368 -- __GEN_RSET(3368) --#endif --#ifdef CONFIG_BCM63XX_CPU_6328 -- __GEN_RSET(6328) --#endif --#ifdef CONFIG_BCM63XX_CPU_6338 -- __GEN_RSET(6338) --#endif --#ifdef CONFIG_BCM63XX_CPU_6345 -- __GEN_RSET(6345) --#endif --#ifdef CONFIG_BCM63XX_CPU_6348 -- __GEN_RSET(6348) --#endif --#ifdef CONFIG_BCM63XX_CPU_6358 -- __GEN_RSET(6358) --#endif --#ifdef CONFIG_BCM63XX_CPU_6362 -- __GEN_RSET(6362) --#endif --#ifdef CONFIG_BCM63XX_CPU_6368 -- __GEN_RSET(6368) --#endif --#endif -- /* unreached */ -- return 0; - } - - /* |