This patch introduce the proprietary mask to select PHYID bits from PHYID1 and PHYID2 words. PHYID2 word contain also Intel Device Number (LDN) and Intel Device Revision Nember (LDRN)
Signed-off-by: Sasha Neftin <sasha.nef...@intel.com> Signed-off-by: Guinan Sun <guinanx....@intel.com> --- drivers/net/e1000/base/e1000_defines.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000/base/e1000_defines.h b/drivers/net/e1000/base/e1000_defines.h index 0b215d2cf..bcd7a1008 100644 --- a/drivers/net/e1000/base/e1000_defines.h +++ b/drivers/net/e1000/base/e1000_defines.h @@ -1380,12 +1380,11 @@ #define I82580_I_PHY_ID 0x015403A0 #define I350_I_PHY_ID 0x015403B0 #define I210_I_PHY_ID 0x01410C00 -#ifndef NO_I225_SUPPORT -#define I225_I_PHY_ID 0x67C9DC00 -#endif /* NO_I225_SUPPORT */ #define IGP04E1000_E_PHY_ID 0x02A80391 #define BCM54616_E_PHY_ID 0x03625D10 #define M88_VENDOR 0x0141 +#define I225_I_PHY_ID 0x67C9DC00 +#define I225_I_PHY_ID_MASK 0x3FFFFC00 /* M88E1000 Specific Registers */ #define M88E1000_PHY_SPEC_CTRL 0x10 /* PHY Specific Control Reg */ -- 2.17.1