brcm47xx: misc cleanups
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38980
This commit is contained in:
parent
c48f285147
commit
94f7ae90f8
2 changed files with 2 additions and 4 deletions
|
@ -47,11 +47,9 @@ Subject: [PATCH 18/18] bcm47xx: add cpu_has_vint
|
||||||
void __init arch_init_irq(void)
|
void __init arch_init_irq(void)
|
||||||
{
|
{
|
||||||
#ifdef CONFIG_BCM47XX_BCMA
|
#ifdef CONFIG_BCM47XX_BCMA
|
||||||
@@ -63,5 +76,16 @@ void __init arch_init_irq(void)
|
@@ -64,4 +77,14 @@ void __init arch_init_irq(void)
|
||||||
cp0_compare_irq = 7;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
+
|
|
||||||
mips_cpu_irq_init();
|
mips_cpu_irq_init();
|
||||||
+
|
+
|
||||||
+ if (cpu_has_vint) {
|
+ if (cpu_has_vint) {
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
TG3_CPMU_PHY_STRAP_IS_SERDES;
|
TG3_CPMU_PHY_STRAP_IS_SERDES;
|
||||||
if (is_serdes)
|
if (is_serdes)
|
||||||
tp->phy_addr += 7;
|
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;
|
+ int addr;
|
||||||
+
|
+
|
||||||
+ addr = ssb_gige_get_phyaddr(tp->pdev);
|
+ addr = ssb_gige_get_phyaddr(tp->pdev);
|
||||||
|
|
Loading…
Reference in a new issue