diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-08 11:35:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-08 11:35:54 +0200 |
| commit | 33f9936b2b73dba6c8685994c441c4fd30b04814 (patch) | |
| tree | 9ce8105bc1e44ba66276695927b15df0d3fc185d /drivers/net/e1000e/defines.h | |
| parent | netns: Fix arbitrary net_device-s corruptions on net_ns stop. (diff) | |
| parent | e1000e: don't return half-read eeprom on error (diff) | |
| download | linux-33f9936b2b73dba6c8685994c441c4fd30b04814.tar.xz linux-33f9936b2b73dba6c8685994c441c4fd30b04814.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/e1000e/defines.h')
| -rw-r--r-- | drivers/net/e1000e/defines.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h index 2a53875cddbf..f823b8ba5785 100644 --- a/drivers/net/e1000e/defines.h +++ b/drivers/net/e1000e/defines.h @@ -648,6 +648,8 @@ #define IFE_E_PHY_ID 0x02A80330 #define IFE_PLUS_E_PHY_ID 0x02A80320 #define IFE_C_E_PHY_ID 0x02A80310 +#define BME1000_E_PHY_ID 0x01410CB0 +#define BME1000_E_PHY_ID_R2 0x01410CB1 /* M88E1000 Specific Registers */ #define M88E1000_PHY_SPEC_CTRL 0x10 /* PHY Specific Control Register */ @@ -701,6 +703,14 @@ #define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK 0x0E00 #define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X 0x0800 +/* BME1000 PHY Specific Control Register */ +#define BME1000_PSCR_ENABLE_DOWNSHIFT 0x0800 /* 1 = enable downshift */ + + +#define PHY_PAGE_SHIFT 5 +#define PHY_REG(page, reg) (((page) << PHY_PAGE_SHIFT) | \ + ((reg) & MAX_PHY_REG_ADDRESS)) + /* * Bits... * 15-5: page |