aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-06-30 13:34:37 +0000
committerJonas Gorski <jogo@openwrt.org>2014-06-30 13:34:37 +0000
commite5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61 (patch)
tree4eef5783e11357f98df2083a49b4f240e8e3830c /target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
parent7c76e870395f36de61cadbd9ae4b0b7efc3dd4a7 (diff)
downloadmaster-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.gz
master-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.bz2
master-187ad058-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41422 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 735fe776a8..aa64bff4f1 100644
--- a/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-3.10/520-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2228,6 +2228,85 @@ static struct board_info __initdata boar
+@@ -2220,6 +2220,85 @@ static struct board_info __initdata boar
#endif
/*
@@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -2282,6 +2361,10 @@ static const struct board_info __initcon
+@@ -2274,6 +2353,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
@@ -106,8 +106,10 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
+#endif
};
- /*
-@@ -2463,12 +2546,25 @@ void __init board_prom_init(void)
+ static void __init boardid_fixup(u8 *boot_addr)
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -123,12 +123,25 @@ void __init board_early_setup(const stru
bcm63xx_pci_enabled = 1;
if (BCMCPU_IS_6348())
val |= GPIO_MODE_6348_G2_PCI;