diff options
Diffstat (limited to 'drivers/net/sky2.h')
| -rw-r--r-- | drivers/net/sky2.h | 20 | 
1 files changed, 16 insertions, 4 deletions
| diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h index a5e182dd9819..0bebfb3638f6 100644 --- a/drivers/net/sky2.h +++ b/drivers/net/sky2.h | |||
| @@ -548,6 +548,14 @@ enum { | |||
| 548 | CHIP_ID_YUKON_UL_2 = 0xba, /* YUKON-2 Ultra 2 */ | 548 | CHIP_ID_YUKON_UL_2 = 0xba, /* YUKON-2 Ultra 2 */ | 
| 549 | CHIP_ID_YUKON_OPT = 0xbc, /* YUKON-2 Optima */ | 549 | CHIP_ID_YUKON_OPT = 0xbc, /* YUKON-2 Optima */ | 
| 550 | }; | 550 | }; | 
| 551 | |||
| 552 | enum yukon_xl_rev { | ||
| 553 | CHIP_REV_YU_XL_A0 = 0, | ||
| 554 | CHIP_REV_YU_XL_A1 = 1, | ||
| 555 | CHIP_REV_YU_XL_A2 = 2, | ||
| 556 | CHIP_REV_YU_XL_A3 = 3, | ||
| 557 | }; | ||
| 558 | |||
| 551 | enum yukon_ec_rev { | 559 | enum yukon_ec_rev { | 
| 552 | CHIP_REV_YU_EC_A1 = 0, /* Chip Rev. for Yukon-EC A1/A0 */ | 560 | CHIP_REV_YU_EC_A1 = 0, /* Chip Rev. for Yukon-EC A1/A0 */ | 
| 553 | CHIP_REV_YU_EC_A2 = 1, /* Chip Rev. for Yukon-EC A2 */ | 561 | CHIP_REV_YU_EC_A2 = 1, /* Chip Rev. for Yukon-EC A2 */ | 
| @@ -557,6 +565,7 @@ enum yukon_ec_u_rev { | |||
| 557 | CHIP_REV_YU_EC_U_A0 = 1, | 565 | CHIP_REV_YU_EC_U_A0 = 1, | 
| 558 | CHIP_REV_YU_EC_U_A1 = 2, | 566 | CHIP_REV_YU_EC_U_A1 = 2, | 
| 559 | CHIP_REV_YU_EC_U_B0 = 3, | 567 | CHIP_REV_YU_EC_U_B0 = 3, | 
| 568 | CHIP_REV_YU_EC_U_B1 = 5, | ||
| 560 | }; | 569 | }; | 
| 561 | enum yukon_fe_rev { | 570 | enum yukon_fe_rev { | 
| 562 | CHIP_REV_YU_FE_A1 = 1, | 571 | CHIP_REV_YU_FE_A1 = 1, | 
| @@ -1775,10 +1784,13 @@ enum { | |||
| 1775 | /* GM_SERIAL_MODE 16 bit r/w Serial Mode Register */ | 1784 | /* GM_SERIAL_MODE 16 bit r/w Serial Mode Register */ | 
| 1776 | enum { | 1785 | enum { | 
| 1777 | GM_SMOD_DATABL_MSK = 0x1f<<11, /* Bit 15..11: Data Blinder (r/o) */ | 1786 | GM_SMOD_DATABL_MSK = 0x1f<<11, /* Bit 15..11: Data Blinder (r/o) */ | 
| 1778 | GM_SMOD_LIMIT_4 = 1<<10, /* Bit 10: 4 consecutive Tx trials */ | 1787 | GM_SMOD_LIMIT_4 = 1<<10, /* 4 consecutive Tx trials */ | 
| 1779 | GM_SMOD_VLAN_ENA = 1<<9, /* Bit 9: Enable VLAN (Max. Frame Len) */ | 1788 | GM_SMOD_VLAN_ENA = 1<<9, /* Enable VLAN (Max. Frame Len) */ | 
| 1780 | GM_SMOD_JUMBO_ENA = 1<<8, /* Bit 8: Enable Jumbo (Max. Frame Len) */ | 1789 | GM_SMOD_JUMBO_ENA = 1<<8, /* Enable Jumbo (Max. Frame Len) */ | 
| 1781 | GM_SMOD_IPG_MSK = 0x1f /* Bit 4..0: Inter-Packet Gap (IPG) */ | 1790 | |
| 1791 | GM_NEW_FLOW_CTRL = 1<<6, /* Enable New Flow-Control */ | ||
| 1792 | |||
| 1793 | GM_SMOD_IPG_MSK = 0x1f /* Bit 4..0: Inter-Packet Gap (IPG) */ | ||
| 1782 | }; | 1794 | }; | 
| 1783 | 1795 | ||
| 1784 | #define DATA_BLIND_VAL(x) (((x)<<11) & GM_SMOD_DATABL_MSK) | 1796 | #define DATA_BLIND_VAL(x) (((x)<<11) & GM_SMOD_DATABL_MSK) | 
