2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 03:33:59 +08:00

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: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger 2007-04-11 14:48:00 -07:00 committed by Jeff Garzik
parent 40b01727a5
commit 4f44d8ba09

View File

@ -2542,16 +2542,14 @@ static void sky2_reset(struct sky2_hw *hw)
int i; int i;
/* disable ASF */ /* disable ASF */
if (hw->chip_id <= CHIP_ID_YUKON_EC) { if (hw->chip_id == CHIP_ID_YUKON_EX) {
if (hw->chip_id == CHIP_ID_YUKON_EX) { status = sky2_read16(hw, HCU_CCSR);
status = sky2_read16(hw, HCU_CCSR); status &= ~(HCU_CCSR_AHB_RST | HCU_CCSR_CPU_RST_MODE |
status &= ~(HCU_CCSR_AHB_RST | HCU_CCSR_CPU_RST_MODE | HCU_CCSR_UC_STATE_MSK);
HCU_CCSR_UC_STATE_MSK); sky2_write16(hw, HCU_CCSR, status);
sky2_write16(hw, HCU_CCSR, status); } else
} else sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET);
sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET); sky2_write16(hw, B0_CTST, Y2_ASF_DISABLE);
sky2_write16(hw, B0_CTST, Y2_ASF_DISABLE);
}
/* do a SW reset */ /* do a SW reset */
sky2_write8(hw, B0_CTST, CS_RST_SET); sky2_write8(hw, B0_CTST, CS_RST_SET);