diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2009-11-02 09:29:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-03 02:39:10 -0500 |
commit | c73430d04ec75962e20e186d34c40b6d999f0968 (patch) | |
tree | 5b4e2ad9868925397e34c17eaaa9ee6d4a458116 | |
parent | 219c6efefaa3f5cd05db52cda50402b2e1c9ae21 (diff) |
tg3: Add 50610M phy ID for 5785
This patch adds the 50610M phy ID for 5785.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/tg3.c | 2 | ||||
-rw-r--r-- | drivers/net/tg3.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 7bebb4778897..0aecd07d3f6b 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -940,6 +940,7 @@ static void tg3_mdio_config_5785(struct tg3 *tp) | |||
940 | phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]; | 940 | phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]; |
941 | switch (phydev->drv->phy_id & phydev->drv->phy_id_mask) { | 941 | switch (phydev->drv->phy_id & phydev->drv->phy_id_mask) { |
942 | case TG3_PHY_ID_BCM50610: | 942 | case TG3_PHY_ID_BCM50610: |
943 | case TG3_PHY_ID_BCM50610M: | ||
943 | val = MAC_PHYCFG2_50610_LED_MODES; | 944 | val = MAC_PHYCFG2_50610_LED_MODES; |
944 | break; | 945 | break; |
945 | case TG3_PHY_ID_BCMAC131: | 946 | case TG3_PHY_ID_BCMAC131: |
@@ -1098,6 +1099,7 @@ static int tg3_mdio_init(struct tg3 *tp) | |||
1098 | phydev->interface = PHY_INTERFACE_MODE_GMII; | 1099 | phydev->interface = PHY_INTERFACE_MODE_GMII; |
1099 | break; | 1100 | break; |
1100 | case TG3_PHY_ID_BCM50610: | 1101 | case TG3_PHY_ID_BCM50610: |
1102 | case TG3_PHY_ID_BCM50610M: | ||
1101 | if (tp->tg3_flags3 & TG3_FLG3_RGMII_STD_IBND_DISABLE) | 1103 | if (tp->tg3_flags3 & TG3_FLG3_RGMII_STD_IBND_DISABLE) |
1102 | phydev->dev_flags |= PHY_BRCM_STD_IBND_DISABLE; | 1104 | phydev->dev_flags |= PHY_BRCM_STD_IBND_DISABLE; |
1103 | if (tp->tg3_flags3 & TG3_FLG3_RGMII_EXT_IBND_RX_EN) | 1105 | if (tp->tg3_flags3 & TG3_FLG3_RGMII_EXT_IBND_RX_EN) |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 9999345a11a4..d770da124b85 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2864,6 +2864,7 @@ struct tg3 { | |||
2864 | #define PHY_REV_BCM5401_C0 0x6 | 2864 | #define PHY_REV_BCM5401_C0 0x6 |
2865 | #define PHY_REV_BCM5411_X0 0x1 /* Found on Netgear GA302T */ | 2865 | #define PHY_REV_BCM5411_X0 0x1 /* Found on Netgear GA302T */ |
2866 | #define TG3_PHY_ID_BCM50610 0x143bd60 | 2866 | #define TG3_PHY_ID_BCM50610 0x143bd60 |
2867 | #define TG3_PHY_ID_BCM50610M 0x143bd70 | ||
2867 | #define TG3_PHY_ID_BCMAC131 0x143bc70 | 2868 | #define TG3_PHY_ID_BCMAC131 0x143bc70 |
2868 | #define TG3_PHY_ID_RTL8211C 0x001cc910 | 2869 | #define TG3_PHY_ID_RTL8211C 0x001cc910 |
2869 | #define TG3_PHY_ID_RTL8201E 0x00008200 | 2870 | #define TG3_PHY_ID_RTL8201E 0x00008200 |