Subject: [PATCH 3/6] sky2: disable ASF on all chip types

From: Stephen Hemminger <[email-masked]>
Date: Wed, 11 Apr 2007 14:48:00 -0700

Need to make sure and disable ASF on all chip types. Otherwise, there may be
random reboots.

Signed-off-by: Stephen Hemminger <[email-masked]>
---
 drivers/net/sky2.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

--- sky2-2.6.21.orig/drivers/net/sky2.c	2007-04-11 14:10:13.000000000 -0700
+++ sky2-2.6.21/drivers/net/sky2.c	2007-04-11 14:11:48.000000000 -0700
@@ -2542,16 +2542,14 @@ static void sky2_reset(struct sky2_hw *h
 	int i;
 
 	/* disable ASF */
-	if (hw->chip_id <= CHIP_ID_YUKON_EC) {
-		if (hw->chip_id == CHIP_ID_YUKON_EX) {
-			status = sky2_read16(hw, HCU_CCSR);
-			status &= ~(HCU_CCSR_AHB_RST | HCU_CCSR_CPU_RST_MODE |
-				    HCU_CCSR_UC_STATE_MSK);
-			sky2_write16(hw, HCU_CCSR, status);
-		} else
-			sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
-		sky2_write16(hw, B0_CTST, Y2_ASF_DISABLE);
-	}
+	if (hw->chip_id == CHIP_ID_YUKON_EX) {
+		status = sky2_read16(hw, HCU_CCSR);
+		status &= ~(HCU_CCSR_AHB_RST | HCU_CCSR_CPU_RST_MODE |
+			    HCU_CCSR_UC_STATE_MSK);
+		sky2_write16(hw, HCU_CCSR, status);
+	} else
+		sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
+	sky2_write16(hw, B0_CTST, Y2_ASF_DISABLE);
 
 	/* do a SW reset */
 	sky2_write8(hw, B0_CTST, CS_RST_SET);

--
Stephen Hemminger <[email-masked]>