diff options
| author | Eilon Greenstein <eilong@broadcom.com> | 2009-02-12 08:36:47 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-15 23:31:15 -0800 |
| commit | 35b19ba51c1e6258a338a0855c72384abc33ce11 (patch) | |
| tree | cf67f18b4ec1d228fdef2e607e814c2fa48d8137 /drivers/net/bnx2x_hsi.h | |
| parent | 1c06328c0345638ea7532b45cadfe713c9e9781e (diff) | |
| download | linux-35b19ba51c1e6258a338a0855c72384abc33ce11.tar.gz linux-35b19ba51c1e6258a338a0855c72384abc33ce11.tar.bz2 linux-35b19ba51c1e6258a338a0855c72384abc33ce11.zip | |
bnx2x: Removing the board type
There are too many different board types and this field is not scalable.
Removing it and making decisions according to other fields
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x_hsi.h')
| -rw-r--r-- | drivers/net/bnx2x_hsi.h | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h index b0f41d1f9ab4..85e4df68b5d8 100644 --- a/drivers/net/bnx2x_hsi.h +++ b/drivers/net/bnx2x_hsi.h @@ -119,35 +119,15 @@ struct shared_hw_cfg { /* NVRAM Offset */ #define SHARED_HW_CFG_UMP_NC_SI_EXT_PHY_TYPE_BCM5221 0x00010000 u32 board; /* 0x124 */ -#define SHARED_HW_CFG_BOARD_TYPE_MASK 0x0000ffff -#define SHARED_HW_CFG_BOARD_TYPE_SHIFT 0 -#define SHARED_HW_CFG_BOARD_TYPE_NONE 0x00000000 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1000 0x00000001 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1001 0x00000002 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1002G 0x00000003 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1004G 0x00000004 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1007G 0x00000005 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1015G 0x00000006 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1020G 0x00000007 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1003G 0x00000008 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G 0x00000009 -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G 0x0000000a -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1023G 0x0000000b -#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1033G 0x0000000c -#define SHARED_HW_CFG_BOARD_TYPE_BCM957711T1101 0x0000000d -#define SHARED_HW_CFG_BOARD_TYPE_BCM957711ET1201 0x0000000e -#define SHARED_HW_CFG_BOARD_TYPE_BCM957711A1133G 0x0000000f -#define SHARED_HW_CFG_BOARD_TYPE_BCM957711EA1233G 0x00000010 - -#define SHARED_HW_CFG_BOARD_VER_MASK 0xffff0000 -#define SHARED_HW_CFG_BOARD_VER_SHIFT 16 -#define SHARED_HW_CFG_BOARD_MAJOR_VER_MASK 0xf0000000 -#define SHARED_HW_CFG_BOARD_MAJOR_VER_SHIFT 28 -#define SHARED_HW_CFG_BOARD_MINOR_VER_MASK 0x0f000000 -#define SHARED_HW_CFG_BOARD_MINOR_VER_SHIFT 24 -#define SHARED_HW_CFG_BOARD_REV_MASK 0x00ff0000 +#define SHARED_HW_CFG_BOARD_REV_MASK 0x00FF0000 #define SHARED_HW_CFG_BOARD_REV_SHIFT 16 +#define SHARED_HW_CFG_BOARD_MAJOR_VER_MASK 0x0F000000 +#define SHARED_HW_CFG_BOARD_MAJOR_VER_SHIFT 24 + +#define SHARED_HW_CFG_BOARD_MINOR_VER_MASK 0xF0000000 +#define SHARED_HW_CFG_BOARD_MINOR_VER_SHIFT 28 + u32 reserved; /* 0x128 */ }; |