aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.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/347-MIPS-BCM6318-USB-support.patch
parent7c76e870395f36de61cadbd9ae4b0b7efc3dd4a7 (diff)
downloadupstream-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.gz
upstream-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.bz2
upstream-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/347-MIPS-BCM6318-USB-support.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch b/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch
index cd4189be5e..a3807b3c2e 100644
--- a/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch
+++ b/target/linux/brcm63xx/patches-3.10/347-MIPS-BCM6318-USB-support.patch
@@ -93,9 +93,9 @@
/*************************************************************************
* _REG relative to RSET_USBD
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -914,6 +914,15 @@ void __init board_prom_init(void)
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -129,6 +129,15 @@ void __init board_early_setup(const stru
}
bcm_gpio_writel(val, GPIO_MODE_REG);
@@ -110,7 +110,7 @@
+#endif
}
- /*
+
--- a/arch/mips/bcm63xx/Kconfig
+++ b/arch/mips/bcm63xx/Kconfig
@@ -22,6 +22,8 @@ config BCM63XX_CPU_6318