diff options
| author | Manasi Deval <manasi.deval@intel.com> | 2006-08-16 13:47:20 -0700 |
|---|---|---|
| committer | Auke Kok <juke-jan.h.kok@intel.com> | 2006-08-16 13:47:20 -0700 |
| commit | 0fe198a5e10229b269624a18bbd390001a8d3476 (patch) | |
| tree | 80d96642bec0829a89082a121c78c4aeaa067e0b | |
| parent | dc335d9735220b3a9ece5ec2d95864b1e8ff06a0 (diff) | |
| download | kernel_samsung_aries-0fe198a5e10229b269624a18bbd390001a8d3476.zip kernel_samsung_aries-0fe198a5e10229b269624a18bbd390001a8d3476.tar.gz kernel_samsung_aries-0fe198a5e10229b269624a18bbd390001a8d3476.tar.bz2 | |
ixgb: Add CX4 PHY type detection and subdevice ID.
Signed-off-by: Manasi Deval <manasi.deval@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| -rw-r--r-- | drivers/net/ixgb/ixgb_hw.c | 11 | ||||
| -rw-r--r-- | drivers/net/ixgb/ixgb_ids.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c index f7fa10e..2b15155 100644 --- a/drivers/net/ixgb/ixgb_hw.c +++ b/drivers/net/ixgb/ixgb_hw.c @@ -236,6 +236,17 @@ ixgb_identify_phy(struct ixgb_hw *hw) DEBUGOUT("Identified G6104 optics\n"); phy_type = ixgb_phy_type_g6104; break; + case IXGB_DEVICE_ID_82597EX_CX4: + DEBUGOUT("Identified CX4\n"); + xpak_vendor = ixgb_identify_xpak_vendor(hw); + if (xpak_vendor == ixgb_xpak_vendor_intel) { + DEBUGOUT("Identified TXN17201 optics\n"); + phy_type = ixgb_phy_type_txn17201; + } else { + DEBUGOUT("Identified G6005 optics\n"); + phy_type = ixgb_phy_type_g6005; + } + break; default: DEBUGOUT("Unknown physical layer module\n"); phy_type = ixgb_phy_type_unknown; diff --git a/drivers/net/ixgb/ixgb_ids.h b/drivers/net/ixgb/ixgb_ids.h index 40a085f..9fd6118 100644 --- a/drivers/net/ixgb/ixgb_ids.h +++ b/drivers/net/ixgb/ixgb_ids.h @@ -45,6 +45,7 @@ #define IXGB_DEVICE_ID_82597EX_CX4 0x109E #define IXGB_SUBDEVICE_ID_A00C 0xA00C +#define IXGB_SUBDEVICE_ID_A01C 0xA01C #endif /* #ifndef _IXGB_IDS_H_ */ /* End of File */ |