diff options
-rw-r--r-- | drivers/net/tg3.c | 3 | ||||
-rw-r--r-- | drivers/net/tg3.h | 4 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 14e964524969..d443b7372325 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -173,6 +173,7 @@ static struct pci_device_id tg3_pci_tbl[] = { | |||
173 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F)}, | 173 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F)}, |
174 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5720)}, | 174 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5720)}, |
175 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721)}, | 175 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721)}, |
176 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5722)}, | ||
176 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750)}, | 177 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750)}, |
177 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751)}, | 178 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751)}, |
178 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750M)}, | 179 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750M)}, |
@@ -187,6 +188,7 @@ static struct pci_device_id tg3_pci_tbl[] = { | |||
187 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5754M)}, | 188 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5754M)}, |
188 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5755)}, | 189 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5755)}, |
189 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5755M)}, | 190 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5755M)}, |
191 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5756)}, | ||
190 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5786)}, | 192 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5786)}, |
191 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787)}, | 193 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787)}, |
192 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M)}, | 194 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M)}, |
@@ -11273,6 +11275,7 @@ static char * __devinit tg3_phy_string(struct tg3 *tp) | |||
11273 | case PHY_ID_BCM5780: return "5780"; | 11275 | case PHY_ID_BCM5780: return "5780"; |
11274 | case PHY_ID_BCM5755: return "5755"; | 11276 | case PHY_ID_BCM5755: return "5755"; |
11275 | case PHY_ID_BCM5787: return "5787"; | 11277 | case PHY_ID_BCM5787: return "5787"; |
11278 | case PHY_ID_BCM5756: return "5722/5756"; | ||
11276 | case PHY_ID_BCM8002: return "8002/serdes"; | 11279 | case PHY_ID_BCM8002: return "8002/serdes"; |
11277 | case 0: return "serdes"; | 11280 | case 0: return "serdes"; |
11278 | default: return "unknown"; | 11281 | default: return "unknown"; |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index f7462c2ccc0a..feed13dc8719 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2282,6 +2282,7 @@ struct tg3 { | |||
2282 | #define PHY_ID_BCM5780 0x60008350 | 2282 | #define PHY_ID_BCM5780 0x60008350 |
2283 | #define PHY_ID_BCM5755 0xbc050cc0 | 2283 | #define PHY_ID_BCM5755 0xbc050cc0 |
2284 | #define PHY_ID_BCM5787 0xbc050ce0 | 2284 | #define PHY_ID_BCM5787 0xbc050ce0 |
2285 | #define PHY_ID_BCM5756 0xbc050ed0 | ||
2285 | #define PHY_ID_BCM8002 0x60010140 | 2286 | #define PHY_ID_BCM8002 0x60010140 |
2286 | #define PHY_ID_INVALID 0xffffffff | 2287 | #define PHY_ID_INVALID 0xffffffff |
2287 | #define PHY_ID_REV_MASK 0x0000000f | 2288 | #define PHY_ID_REV_MASK 0x0000000f |
@@ -2308,7 +2309,8 @@ struct tg3 { | |||
2308 | (X) == PHY_ID_BCM5705 || (X) == PHY_ID_BCM5750 || \ | 2309 | (X) == PHY_ID_BCM5705 || (X) == PHY_ID_BCM5750 || \ |
2309 | (X) == PHY_ID_BCM5752 || (X) == PHY_ID_BCM5714 || \ | 2310 | (X) == PHY_ID_BCM5752 || (X) == PHY_ID_BCM5714 || \ |
2310 | (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ | 2311 | (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \ |
2311 | (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM8002) | 2312 | (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \ |
2313 | (X) == PHY_ID_BCM8002) | ||
2312 | 2314 | ||
2313 | struct tg3_hw_stats *hw_stats; | 2315 | struct tg3_hw_stats *hw_stats; |
2314 | dma_addr_t stats_mapping; | 2316 | dma_addr_t stats_mapping; |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 61db1907f06f..ea3140d226e6 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1904,6 +1904,7 @@ | |||
1904 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 | 1904 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 |
1905 | #define PCI_DEVICE_ID_TIGON3_5720 0x1658 | 1905 | #define PCI_DEVICE_ID_TIGON3_5720 0x1658 |
1906 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 | 1906 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 |
1907 | #define PCI_DEVICE_ID_TIGON3_5722 0x165a | ||
1907 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d | 1908 | #define PCI_DEVICE_ID_TIGON3_5705M 0x165d |
1908 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e | 1909 | #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e |
1909 | #define PCI_DEVICE_ID_TIGON3_5714 0x1668 | 1910 | #define PCI_DEVICE_ID_TIGON3_5714 0x1668 |
@@ -1913,6 +1914,7 @@ | |||
1913 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e | 1914 | #define PCI_DEVICE_ID_TIGON3_5705F 0x166e |
1914 | #define PCI_DEVICE_ID_TIGON3_5754M 0x1672 | 1915 | #define PCI_DEVICE_ID_TIGON3_5754M 0x1672 |
1915 | #define PCI_DEVICE_ID_TIGON3_5755M 0x1673 | 1916 | #define PCI_DEVICE_ID_TIGON3_5755M 0x1673 |
1917 | #define PCI_DEVICE_ID_TIGON3_5756 0x1674 | ||
1916 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 | 1918 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 |
1917 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 | 1919 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 |
1918 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 | 1920 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 |