diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-09-28 23:15:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-02 15:40:57 -0400 |
| commit | ee002b64ec81db846b5518d73fd724a53b27fbf2 (patch) | |
| tree | 56cd4a0baba41d8fbc3e3c6b798f0be74fb6bf2b /drivers/net/ethernet/broadcom/tg3.c | |
| parent | 4bcef89f0c6ca1eb4f1a789c2a226f4c02656a4b (diff) | |
| download | blackbird-op-linux-ee002b64ec81db846b5518d73fd724a53b27fbf2.tar.gz blackbird-op-linux-ee002b64ec81db846b5518d73fd724a53b27fbf2.zip | |
tg3: use phylib when robo switch is in use
When a switch is connected as a PHY to the MAC driven by tg3, use
phylib and provide the phy address to tg3 from the sprom.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 853a05e0691f..a17a3c93e398 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -1513,6 +1513,13 @@ static int tg3_mdio_init(struct tg3 *tp) TG3_CPMU_PHY_STRAP_IS_SERDES; if (is_serdes) tp->phy_addr += 7; + } else if (tg3_flag(tp, IS_SSB_CORE) && tg3_flag(tp, ROBOSWITCH)) { + int addr; + + addr = ssb_gige_get_phyaddr(tp->pdev); + if (addr < 0) + return addr; + tp->phy_addr = addr; } else tp->phy_addr = TG3_PHY_MII_ADDR; @@ -17366,8 +17373,10 @@ static int tg3_init_one(struct pci_dev *pdev, tg3_flag_set(tp, FLUSH_POSTED_WRITES); if (ssb_gige_one_dma_at_once(pdev)) tg3_flag_set(tp, ONE_DMA_AT_ONCE); - if (ssb_gige_have_roboswitch(pdev)) + if (ssb_gige_have_roboswitch(pdev)) { + tg3_flag_set(tp, USE_PHYLIB); tg3_flag_set(tp, ROBOSWITCH); + } if (ssb_gige_is_rgmii(pdev)) tg3_flag_set(tp, RGMII_MODE); } |
