diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
commit | dc230d9b0f9ba046fb1e9e51de21ae35504a9aab (patch) | |
tree | 8d43a35b2fbe9a47e9c75f708017d651d47d4fa1 /target/linux/brcm63xx/patches-3.10/528-board_nb6.patch | |
parent | 44ef9f778994e1b9bd37c8525045b53d82b6a504 (diff) | |
download | upstream-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.gz upstream-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.bz2 upstream-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.zip |
brcm63xx: 3.10: backport multi-board support
There have been no reported regressions, so backport it to 3.10.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41422
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/528-board_nb6.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.10/528-board_nb6.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch index 347b183e4a..67d95f906f 100644 --- a/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.10/528-board_nb6.patch @@ -1,14 +1,14 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -17,6 +17,7 @@ - #include <linux/spi/spi.h> - #include <linux/spi/spi_gpio.h> +@@ -18,6 +18,7 @@ + #if 0 /* FIXME: 3.14 removed non-DT support */ #include <linux/spi/74x164.h> + #endif +#include <linux/rtl8367.h> #include <asm/addrspace.h> #include <bcm63xx_board.h> #include <bcm63xx_cpu.h> -@@ -56,6 +57,8 @@ +@@ -634,6 +635,8 @@ static struct board_info __initdata boar #define NB4_SPI_GPIO_MOSI 7 #define NB4_SPI_GPIO_CLK 6 #define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X)) @@ -17,7 +17,7 @@ #define CT6373_PID_OFFSET 0xff80 #define CT6373_74X164_GPIO_BASE 64 -@@ -2668,6 +2671,104 @@ static struct board_info __initdata boar +@@ -2664,6 +2667,104 @@ static struct board_info __initdata boar }; #endif @@ -122,7 +122,7 @@ /* * known 6368 boards */ -@@ -2874,6 +2975,10 @@ static const struct board_info __initcon +@@ -2870,6 +2971,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -133,7 +133,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -2941,6 +3046,11 @@ static void __init boardid_fixup(u8 *boo +@@ -2891,6 +2996,11 @@ static void __init boardid_fixup(u8 *boo } } |