From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 1 Dec 2013 18:12:57 +0000 (+0000)
Subject: brcm47xx: misc cleanups
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=94f7ae90f8bd951cd5726ed3ad171a263a67ea62;p=openwrt%2Fstaging%2Fnbd.git

brcm47xx: misc cleanups

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 38980
---

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);