aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-12-01 18:12:57 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-12-01 18:12:57 +0000
commit94f7ae90f8bd951cd5726ed3ad171a263a67ea62 (patch)
tree2350847b915c34f119041b200b7b702158d1228d /target/linux
parentc48f2851473bf24cdfec371c5857826eaa6007b5 (diff)
downloadupstream-94f7ae90f8bd951cd5726ed3ad171a263a67ea62.tar.gz
upstream-94f7ae90f8bd951cd5726ed3ad171a263a67ea62.tar.bz2
upstream-94f7ae90f8bd951cd5726ed3ad171a263a67ea62.zip
brcm47xx: misc cleanups
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38980
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm47xx/patches-3.10/110-MIPS-BCM47XX-add-vint-irq.patch4
-rw-r--r--target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch2
2 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/110-MIPS-BCM47XX-add-vint-irq.patch b/target/linux/brcm47xx/patches-3.10/110-MIPS-BCM47XX-add-vint-irq.patch
index 6351a9c4d4..e77f5d9173 100644
--- a/target/linux/brcm47xx/patches-3.10/110-MIPS-BCM47XX-add-vint-irq.patch
+++ b/target/linux/brcm47xx/patches-3.10/110-MIPS-BCM47XX-add-vint-irq.patch
@@ -47,11 +47,9 @@ Subject: [PATCH 18/18] bcm47xx: add cpu_has_vint
void __init arch_init_irq(void)
{
#ifdef CONFIG_BCM47XX_BCMA
-@@ -63,5 +76,16 @@ void __init arch_init_irq(void)
- cp0_compare_irq = 7;
+@@ -64,4 +77,14 @@ void __init arch_init_irq(void)
}
#endif
-+
mips_cpu_irq_init();
+
+ if (cpu_has_vint) {
diff --git a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
index 19ab8fef2f..3529f8c901 100644
--- a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
+++ b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch
@@ -31,7 +31,7 @@
TG3_CPMU_PHY_STRAP_IS_SERDES;
if (is_serdes)
tp->phy_addr += 7;
-+ } else if (tg3_flag(tp, IS_SSB_CORE)) {
++ } else if (tg3_flag(tp, IS_SSB_CORE) && tg3_flag(tp, ROBOSWITCH)) {
+ int addr;
+
+ addr = ssb_gige_get_phyaddr(tp->pdev);