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 6351a9c4d49840d97475e207feb928f87730532e..e77f5d9173bf8f633dec44398172a9f1ab753851 100644 (file)
--- 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 19ab8fef2fcc0a5c540add882bea83289cf9e343..3529f8c901b539f69120cbc361009f2852ae45ee 100644 (file)
--- 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);