diff options
| author |   Yaniv Rosner <yanivr@broadcom.com> | 2011-11-28 00:49:49 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-11-28 19:02:23 -0500 |
| commit | ec15b898a4a812e89a63b8e52bc11d4e84d74db1 (patch) | |
| tree | cf5207e5e6364cf342648cafd9ce83989ba74e69 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | |
| parent | bnx2x: Fix BCM84833 link and LED behavior (diff) | |
| download | linux-dev-ec15b898a4a812e89a63b8e52bc11d4e84d74db1.tar.xz linux-dev-ec15b898a4a812e89a63b8e52bc11d4e84d74db1.zip | |
bnx2x: Change Warpcore MDIO work around mode
This patch enables the usage of simpler MDC/MDIO work-around when accessing Warpcore registers.
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index 6523723b9d1e..4ffc75dfa10a 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c @@ -11308,7 +11308,9 @@ static int bnx2x_populate_int_phy(struct bnx2x *bp, u32 shmem_base, u8 port, offsetof(struct shmem_region, dev_info.port_feature_config[port].link_config)) & PORT_FEATURE_CONNECTED_SWITCH_MASK); - chip_id = REG_RD(bp, MISC_REG_CHIP_NUM) << 16; + chip_id = (REG_RD(bp, MISC_REG_CHIP_NUM) << 16) | + ((REG_RD(bp, MISC_REG_CHIP_REV) & 0xf) << 12); + DP(NETIF_MSG_LINK, ":chip_id = 0x%x\n", chip_id); if (USES_WARPCORE(bp)) { u32 serdes_net_if; |