diff options
author | Yaniv Rosner <yaniv.rosner@broadcom.com> | 2010-09-07 07:41:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-07 16:15:42 -0400 |
commit | a22f078867ef362e35c54055878168e6613ff743 (patch) | |
tree | 2cf683f3057b7ed5dcaaaad16192f3a267dcf0f8 /drivers/net/bnx2x/bnx2x_reg.h | |
parent | de6eae1f42eae736548f293570fd867bd37c3bdd (diff) |
bnx2x: Add dual-media changes
Add required changes in order to support dual-media boards.
Signed-off-by: Yaniv Rosner <yanivr@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_reg.h')
-rw-r--r-- | drivers/net/bnx2x/bnx2x_reg.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h index 398cf55b8e1..f0a69563b66 100644 --- a/drivers/net/bnx2x/bnx2x_reg.h +++ b/drivers/net/bnx2x/bnx2x_reg.h | |||
@@ -4964,6 +4964,8 @@ | |||
4964 | #define MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN 0x0001 | 4964 | #define MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_PRL_DT_EN 0x0001 |
4965 | #define MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_AN_FST_TMR 0x0040 | 4965 | #define MDIO_SERDES_DIGITAL_A_1000X_CONTROL2_AN_FST_TMR 0x0040 |
4966 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1 0x14 | 4966 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1 0x14 |
4967 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_SGMII 0x0001 | ||
4968 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_LINK 0x0002 | ||
4967 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_DUPLEX 0x0004 | 4969 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_DUPLEX 0x0004 |
4968 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_SPEED_MASK 0x0018 | 4970 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_SPEED_MASK 0x0018 |
4969 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_SPEED_SHIFT 3 | 4971 | #define MDIO_SERDES_DIGITAL_A_1000X_STATUS1_SPEED_SHIFT 3 |
@@ -5192,6 +5194,8 @@ Theotherbitsarereservedandshouldbezero*/ | |||
5192 | #define MDIO_XS_8706_REG_BANK_RX3 0x80ec | 5194 | #define MDIO_XS_8706_REG_BANK_RX3 0x80ec |
5193 | #define MDIO_XS_8706_REG_BANK_RXA 0x80fc | 5195 | #define MDIO_XS_8706_REG_BANK_RXA 0x80fc |
5194 | 5196 | ||
5197 | #define MDIO_XS_REG_8073_RX_CTRL_PCIE 0x80FA | ||
5198 | |||
5195 | #define MDIO_AN_DEVAD 0x7 | 5199 | #define MDIO_AN_DEVAD 0x7 |
5196 | /*ieee*/ | 5200 | /*ieee*/ |
5197 | #define MDIO_AN_REG_CTRL 0x0000 | 5201 | #define MDIO_AN_REG_CTRL 0x0000 |
@@ -5227,6 +5231,27 @@ Theotherbitsarereservedandshouldbezero*/ | |||
5227 | #define MDIO_AN_REG_8481_AUX_CTRL 0xfff8 | 5231 | #define MDIO_AN_REG_8481_AUX_CTRL 0xfff8 |
5228 | #define MDIO_AN_REG_8481_LEGACY_SHADOW 0xfffc | 5232 | #define MDIO_AN_REG_8481_LEGACY_SHADOW 0xfffc |
5229 | 5233 | ||
5234 | /* BCM84823 only */ | ||
5235 | #define MDIO_CTL_DEVAD 0x1e | ||
5236 | #define MDIO_CTL_REG_84823_MEDIA 0x401a | ||
5237 | #define MDIO_CTL_REG_84823_MEDIA_MAC_MASK 0x0018 | ||
5238 | /* These pins configure the BCM84823 interface to MAC after reset. */ | ||
5239 | #define MDIO_CTL_REG_84823_CTRL_MAC_XFI 0x0008 | ||
5240 | #define MDIO_CTL_REG_84823_MEDIA_MAC_XAUI_M 0x0010 | ||
5241 | /* These pins configure the BCM84823 interface to Line after reset. */ | ||
5242 | #define MDIO_CTL_REG_84823_MEDIA_LINE_MASK 0x0060 | ||
5243 | #define MDIO_CTL_REG_84823_MEDIA_LINE_XAUI_L 0x0020 | ||
5244 | #define MDIO_CTL_REG_84823_MEDIA_LINE_XFI 0x0040 | ||
5245 | /* When this pin is active high during reset, 10GBASE-T core is power | ||
5246 | * down, When it is active low the 10GBASE-T is power up | ||
5247 | */ | ||
5248 | #define MDIO_CTL_REG_84823_MEDIA_COPPER_CORE_DOWN 0x0080 | ||
5249 | #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_MASK 0x0100 | ||
5250 | #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER 0x0000 | ||
5251 | #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_FIBER 0x0100 | ||
5252 | #define MDIO_CTL_REG_84823_MEDIA_FIBER_1G 0x1000 | ||
5253 | |||
5254 | |||
5230 | #define IGU_FUNC_BASE 0x0400 | 5255 | #define IGU_FUNC_BASE 0x0400 |
5231 | 5256 | ||
5232 | #define IGU_ADDR_MSIX 0x0000 | 5257 | #define IGU_ADDR_MSIX 0x0000 |