Commit 5b4e9f92 authored by Manish Lachwani's avatar Manish Lachwani Committed by Jeff Garzik

[netdrvr tg3] add support for another 5704 board, fix up 5704 phy init

parent 18acef16
...@@ -5775,7 +5775,8 @@ static int __devinit tg3_phy_probe(struct tg3 *tp) ...@@ -5775,7 +5775,8 @@ static int __devinit tg3_phy_probe(struct tg3 *tp)
tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x2aaa); tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x2aaa);
} }
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) { if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) &&
(tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)) {
tg3_writephy(tp, 0x1c, 0x8d68); tg3_writephy(tp, 0x1c, 0x8d68);
tg3_writephy(tp, 0x1c, 0x8d68); tg3_writephy(tp, 0x1c, 0x8d68);
} }
...@@ -6104,6 +6105,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) ...@@ -6104,6 +6105,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_5703 && grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_5703 &&
grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_5703S && grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_5703S &&
grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_5704 && grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_5704 &&
grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_5704_A2 &&
grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_AC91002A1) grc_misc_cfg != GRC_MISC_CFG_BOARD_ID_AC91002A1)
return -ENODEV; return -ENODEV;
......
...@@ -113,6 +113,8 @@ ...@@ -113,6 +113,8 @@
#define CHIPREV_ID_5703_A2 0x1002 #define CHIPREV_ID_5703_A2 0x1002
#define CHIPREV_ID_5703_A3 0x1003 #define CHIPREV_ID_5703_A3 0x1003
#define CHIPREV_ID_5704_A0 0x2000 #define CHIPREV_ID_5704_A0 0x2000
#define CHIPREV_ID_5704_A1 0x2001
#define CHIPREV_ID_5704_A2 0x2002
#define GET_ASIC_REV(CHIP_REV_ID) ((CHIP_REV_ID) >> 12) #define GET_ASIC_REV(CHIP_REV_ID) ((CHIP_REV_ID) >> 12)
#define ASIC_REV_5700 0x07 #define ASIC_REV_5700 0x07
#define ASIC_REV_5701 0x00 #define ASIC_REV_5701 0x00
...@@ -1136,6 +1138,7 @@ ...@@ -1136,6 +1138,7 @@
#define GRC_MISC_CFG_BOARD_ID_5703S 0x00002000 #define GRC_MISC_CFG_BOARD_ID_5703S 0x00002000
#define GRC_MISC_CFG_BOARD_ID_5704 0x00000000 #define GRC_MISC_CFG_BOARD_ID_5704 0x00000000
#define GRC_MISC_CFG_BOARD_ID_5704CIOBE 0x00004000 #define GRC_MISC_CFG_BOARD_ID_5704CIOBE 0x00004000
#define GRC_MISC_CFG_BOARD_ID_5704_A2 0x00008000
#define GRC_MISC_CFG_BOARD_ID_AC91002A1 0x00018000 #define GRC_MISC_CFG_BOARD_ID_AC91002A1 0x00018000
#define GRC_LOCAL_CTRL 0x00006808 #define GRC_LOCAL_CTRL 0x00006808
#define GRC_LCLCTRL_INT_ACTIVE 0x00000001 #define GRC_LCLCTRL_INT_ACTIVE 0x00000001
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment