diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2005-07-22 19:26:06 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-31 00:40:53 -0400 |
commit | 382317138b3ade02c9c319531ab0619e95dbc672 (patch) | |
tree | adee238f38285c8a43c7d94c0a7f2f16e3120db9 | |
parent | 4ff6ac052b90ee4dfee92f8e2c5cb7ef8a4d8f13 (diff) |
[PATCH] skge: support yukon lite rev 4
The check for Yukon lite changes was restricting itself to
rev A3. It turns out that these changes are also true on A4
and later.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r-- | drivers/net/skge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 9fa519574203..0857be8f99f2 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -1687,7 +1687,7 @@ static void yukon_mac_init(struct skge_hw *hw, int port) | |||
1687 | 1687 | ||
1688 | /* WA code for COMA mode -- set PHY reset */ | 1688 | /* WA code for COMA mode -- set PHY reset */ |
1689 | if (hw->chip_id == CHIP_ID_YUKON_LITE && | 1689 | if (hw->chip_id == CHIP_ID_YUKON_LITE && |
1690 | hw->chip_rev == CHIP_REV_YU_LITE_A3) | 1690 | hw->chip_rev >= CHIP_REV_YU_LITE_A3) |
1691 | skge_write32(hw, B2_GP_IO, | 1691 | skge_write32(hw, B2_GP_IO, |
1692 | (skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9)); | 1692 | (skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9)); |
1693 | 1693 | ||
@@ -1697,7 +1697,7 @@ static void yukon_mac_init(struct skge_hw *hw, int port) | |||
1697 | 1697 | ||
1698 | /* WA code for COMA mode -- clear PHY reset */ | 1698 | /* WA code for COMA mode -- clear PHY reset */ |
1699 | if (hw->chip_id == CHIP_ID_YUKON_LITE && | 1699 | if (hw->chip_id == CHIP_ID_YUKON_LITE && |
1700 | hw->chip_rev == CHIP_REV_YU_LITE_A3) | 1700 | hw->chip_rev >= CHIP_REV_YU_LITE_A3) |
1701 | skge_write32(hw, B2_GP_IO, | 1701 | skge_write32(hw, B2_GP_IO, |
1702 | (skge_read32(hw, B2_GP_IO) | GP_DIR_9) | 1702 | (skge_read32(hw, B2_GP_IO) | GP_DIR_9) |
1703 | & ~GP_IO_9); | 1703 | & ~GP_IO_9); |
@@ -1790,7 +1790,7 @@ static void yukon_mac_init(struct skge_hw *hw, int port) | |||
1790 | skge_write16(hw, SK_REG(port, RX_GMF_FL_MSK), RX_FF_FL_DEF_MSK); | 1790 | skge_write16(hw, SK_REG(port, RX_GMF_FL_MSK), RX_FF_FL_DEF_MSK); |
1791 | reg = GMF_OPER_ON | GMF_RX_F_FL_ON; | 1791 | reg = GMF_OPER_ON | GMF_RX_F_FL_ON; |
1792 | if (hw->chip_id == CHIP_ID_YUKON_LITE && | 1792 | if (hw->chip_id == CHIP_ID_YUKON_LITE && |
1793 | hw->chip_rev == CHIP_REV_YU_LITE_A3) | 1793 | hw->chip_rev >= CHIP_REV_YU_LITE_A3) |
1794 | reg &= ~GMF_RX_F_FL_ON; | 1794 | reg &= ~GMF_RX_F_FL_ON; |
1795 | skge_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR); | 1795 | skge_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR); |
1796 | skge_write16(hw, SK_REG(port, RX_GMF_CTRL_T), reg); | 1796 | skge_write16(hw, SK_REG(port, RX_GMF_CTRL_T), reg); |
@@ -1807,7 +1807,7 @@ static void yukon_stop(struct skge_port *skge) | |||
1807 | int port = skge->port; | 1807 | int port = skge->port; |
1808 | 1808 | ||
1809 | if (hw->chip_id == CHIP_ID_YUKON_LITE && | 1809 | if (hw->chip_id == CHIP_ID_YUKON_LITE && |
1810 | hw->chip_rev == CHIP_REV_YU_LITE_A3) { | 1810 | hw->chip_rev >= CHIP_REV_YU_LITE_A3) { |
1811 | skge_write32(hw, B2_GP_IO, | 1811 | skge_write32(hw, B2_GP_IO, |
1812 | skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9); | 1812 | skge_read32(hw, B2_GP_IO) | GP_DIR_9 | GP_IO_9); |
1813 | } | 1813 | } |