diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/tg3.c | 2 | ||||
-rw-r--r-- | drivers/net/tg3.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 63a5b96bc086..eea07484f757 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -270,6 +270,7 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = { | |||
270 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57765)}, | 270 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57765)}, |
271 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57791)}, | 271 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57791)}, |
272 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57795)}, | 272 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57795)}, |
273 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5719)}, | ||
273 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, | 274 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)}, |
274 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, | 275 | {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)}, |
275 | {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, | 276 | {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)}, |
@@ -14210,6 +14211,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp) | |||
14210 | case TG3_PHY_ID_BCM5718C: return "5718C"; | 14211 | case TG3_PHY_ID_BCM5718C: return "5718C"; |
14211 | case TG3_PHY_ID_BCM5718S: return "5718S"; | 14212 | case TG3_PHY_ID_BCM5718S: return "5718S"; |
14212 | case TG3_PHY_ID_BCM57765: return "57765"; | 14213 | case TG3_PHY_ID_BCM57765: return "57765"; |
14214 | case TG3_PHY_ID_BCM5719C: return "5719C"; | ||
14213 | case TG3_PHY_ID_BCM8002: return "8002/serdes"; | 14215 | case TG3_PHY_ID_BCM8002: return "8002/serdes"; |
14214 | case 0: return "serdes"; | 14216 | case 0: return "serdes"; |
14215 | default: return "unknown"; | 14217 | default: return "unknown"; |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 74e5bc2c481b..6b6af7698b38 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2949,6 +2949,7 @@ struct tg3 { | |||
2949 | #define TG3_PHY_ID_BCM5718C 0x5c0d8a00 | 2949 | #define TG3_PHY_ID_BCM5718C 0x5c0d8a00 |
2950 | #define TG3_PHY_ID_BCM5718S 0xbc050ff0 | 2950 | #define TG3_PHY_ID_BCM5718S 0xbc050ff0 |
2951 | #define TG3_PHY_ID_BCM57765 0x5c0d8a40 | 2951 | #define TG3_PHY_ID_BCM57765 0x5c0d8a40 |
2952 | #define TG3_PHY_ID_BCM5719C 0x5c0d8a20 | ||
2952 | #define TG3_PHY_ID_BCM5906 0xdc00ac40 | 2953 | #define TG3_PHY_ID_BCM5906 0xdc00ac40 |
2953 | #define TG3_PHY_ID_BCM8002 0x60010140 | 2954 | #define TG3_PHY_ID_BCM8002 0x60010140 |
2954 | #define TG3_PHY_ID_INVALID 0xffffffff | 2955 | #define TG3_PHY_ID_INVALID 0xffffffff |
@@ -2972,7 +2973,8 @@ struct tg3 { | |||
2972 | (X) == TG3_PHY_ID_BCM5755 || (X) == TG3_PHY_ID_BCM5756 || \ | 2973 | (X) == TG3_PHY_ID_BCM5755 || (X) == TG3_PHY_ID_BCM5756 || \ |
2973 | (X) == TG3_PHY_ID_BCM5906 || (X) == TG3_PHY_ID_BCM5761 || \ | 2974 | (X) == TG3_PHY_ID_BCM5906 || (X) == TG3_PHY_ID_BCM5761 || \ |
2974 | (X) == TG3_PHY_ID_BCM5718C || (X) == TG3_PHY_ID_BCM5718S || \ | 2975 | (X) == TG3_PHY_ID_BCM5718C || (X) == TG3_PHY_ID_BCM5718S || \ |
2975 | (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM8002) | 2976 | (X) == TG3_PHY_ID_BCM57765 || (X) == TG3_PHY_ID_BCM5719C || \ |
2977 | (X) == TG3_PHY_ID_BCM8002) | ||
2976 | 2978 | ||
2977 | u32 led_ctrl; | 2979 | u32 led_ctrl; |
2978 | u32 phy_otp; | 2980 | u32 phy_otp; |