Commit 4f44d8ba authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

sky2: disable ASF on all chip types 



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

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 40b01727

drivers/net/sky2.c

+8 −10
Original line number Diff line number Diff line
@@ -2542,7 +2542,6 @@ static void sky2_reset(struct sky2_hw *hw) 
	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 |
@@ -2551,7 +2550,6 @@ static void sky2_reset(struct sky2_hw *hw) 
	} 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);