[TG3]: Add new device IDs.

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index c324aa19c9847447f29e5e1fa34d43ce647d96da..2eaadab98f35db5d497efb08ec60ef5a05c00def 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -176,6 +176,10 @@ static struct pci_device_id tg3_pci_tbl[] = {
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
        { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+       { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F,
+         PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX,
@@ -6420,25 +6424,22 @@ struct subsys_tbl_ent {
 
 static struct subsys_tbl_ent subsys_id_to_phy_id[] = {
        /* Broadcom boards. */
-       { 0x14e4, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
-       { 0x14e4, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
-       { 0x14e4, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
-       { 0x14e4, 0x0003, PHY_ID_SERDES  }, /* BCM95700A9 */
-       { 0x14e4, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
-       { 0x14e4, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
-       { 0x14e4, 0x0007, PHY_ID_SERDES  }, /* BCM95701A7 */
-       { 0x14e4, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
-       { 0x14e4, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
-       { 0x14e4, 0x0009, PHY_ID_BCM5701 }, /* BCM95703Ax1 */
-       { 0x14e4, 0x8009, PHY_ID_BCM5701 }, /* BCM95703Ax2 */
+       { PCI_VENDOR_ID_BROADCOM, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0003, PHY_ID_SERDES  }, /* BCM95700A9 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0007, PHY_ID_SERDES  }, /* BCM95701A7 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
+       { PCI_VENDOR_ID_BROADCOM, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
+       { PCI_VENDOR_ID_BROADCOM, 0x0009, PHY_ID_BCM5701 }, /* BCM95703Ax1 */
+       { PCI_VENDOR_ID_BROADCOM, 0x8009, PHY_ID_BCM5701 }, /* BCM95703Ax2 */
 
        /* 3com boards. */
        { PCI_VENDOR_ID_3COM, 0x1000, PHY_ID_BCM5401 }, /* 3C996T */
        { PCI_VENDOR_ID_3COM, 0x1006, PHY_ID_BCM5701 }, /* 3C996BT */
-       /* { PCI_VENDOR_ID_3COM, 0x1002, PHY_ID_XXX },     3C996CT */
-       /* { PCI_VENDOR_ID_3COM, 0x1003, PHY_ID_XXX },     3C997T */
        { PCI_VENDOR_ID_3COM, 0x1004, PHY_ID_SERDES  }, /* 3C996SX */
-       /* { PCI_VENDOR_ID_3COM, 0x1005, PHY_ID_XXX },     3C997SZ */
        { PCI_VENDOR_ID_3COM, 0x1007, PHY_ID_BCM5701 }, /* 3C1000T */
        { PCI_VENDOR_ID_3COM, 0x1008, PHY_ID_BCM5701 }, /* 3C940BR01 */
 
@@ -6453,7 +6454,10 @@ static struct subsys_tbl_ent subsys_id_to_phy_id[] = {
        { PCI_VENDOR_ID_COMPAQ, 0x009a, PHY_ID_BCM5701 }, /* BANSHEE_2 */
        { PCI_VENDOR_ID_COMPAQ, 0x007d, PHY_ID_SERDES  }, /* CHANGELING */
        { PCI_VENDOR_ID_COMPAQ, 0x0085, PHY_ID_BCM5701 }, /* NC7780 */
-       { PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }  /* NC7780_2 */
+       { PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }, /* NC7780_2 */
+
+       /* IBM boards. */
+       { PCI_VENDOR_ID_IBM, 0x0281, PHY_ID_SERDES } /* IBM??? */
 };
 
 static int __devinit tg3_phy_probe(struct tg3 *tp)
@@ -6996,7 +7000,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
            (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
             tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM &&
             (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901 ||
-             tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901_2)))
+             tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901_2 ||
+             tp->pdev->device == PCI_DEVICE_ID_TIGON3_5705F)))
                tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
 
        err = tg3_phy_probe(tp);

diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids
index 911c20f42d7bea39cc29d0ff61f850df56f71837..24aa2cbfe09ac6e13fe6d6a78a4cdd0decde441b 100644 (file)
--- a/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
@@ -5312,11 +5312,13 @@
                10b7 2000  3C998-T Dual Port 10/100/1000 PCI-X
                10b7 3000  3C999-T Quad Port 10/100/1000 PCI-X
                1166 1648  NetXtreme CIOB-E 1000Base-T
+       1649  NetXtreme BCM5704S Gigabit Ethernet
        164d  NetXtreme BCM5702FE Gigabit Ethernet
        1653  NetXtreme BCM5705 Gigabit Ethernet
        1654  NetXtreme BCM5705 Gigabit Ethernet
        165d  NetXtreme BCM5705M Gigabit Ethernet
        165e  NetXtreme BCM5705M Gigabit Ethernet
+       166e  NetXtreme BCM5705F Gigabit Ethernet
        1696  NetXtreme BCM5782 Gigabit Ethernet
                14e4 000d  NetXtreme BCM5782 1000Base-T
        169c  NetXtreme BCM5788 Gigabit Ethernet

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 62fbfadc39c84a1a87b430902d1bf40fade4f4d6..560ee514d458c5426a16c022cf5e39dcb5d2b0ef 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1784,11 +1784,13 @@
 #define PCI_DEVICE_ID_TIGON3_5702      0x1646
 #define PCI_DEVICE_ID_TIGON3_5703      0x1647
 #define PCI_DEVICE_ID_TIGON3_5704      0x1648
+#define PCI_DEVICE_ID_TIGON3_5704S_2   0x1649
 #define PCI_DEVICE_ID_TIGON3_5702FE    0x164d
 #define PCI_DEVICE_ID_TIGON3_5705      0x1653
 #define PCI_DEVICE_ID_TIGON3_5705_2    0x1654
 #define PCI_DEVICE_ID_TIGON3_5705M     0x165d
 #define PCI_DEVICE_ID_TIGON3_5705M_2   0x165e
+#define PCI_DEVICE_ID_TIGON3_5705F     0x166e
 #define PCI_DEVICE_ID_TIGON3_5782      0x1696
 #define PCI_DEVICE_ID_TIGON3_5788      0x169c
 #define PCI_DEVICE_ID_TIGON3_5702X     0x16a6