Commit 72c60683 authored by Mike McCormack's avatar Mike McCormack Committed by David S. Miller
Browse files

sky2: Use 32bit read to read Y2_VAUX_AVAIL 



B0_CTST is a 24bit register according to the vendor driver (sk98lin).
A 16bit read on B0_CTST will always return 0 for Y2_VAUX_AVAIL (1<<16),
 so use a 32bit read when testing Y2_VAUX_AVAIL

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90bbebb4

drivers/net/sky2.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static void sky2_power_aux(struct sky2_hw *hw) 
			    Y2_COR_CLK_LNK2_DIS | Y2_CLK_GAT_LNK2_DIS);



	/* switch power to VAUX */

	if (sky2_read16(hw, B0_CTST) & Y2_VAUX_AVAIL)

	if (sky2_read32(hw, B0_CTST) & Y2_VAUX_AVAIL)

		sky2_write8(hw, B0_POWER_CTRL,

			    (PC_VAUX_ENA | PC_VCC_ENA |

			     PC_VAUX_ON | PC_VCC_OFF));

drivers/net/sky2.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ enum csr_regs { 
	Y2_CFG_AER      = 0x1d00,	/* PCI Advanced Error Report region */

};



/*	B0_CTST			16 bit	Control/Status register */

/*	B0_CTST			24 bit	Control/Status register */

enum {

	Y2_VMAIN_AVAIL	= 1<<17,/* VMAIN available (YUKON-2 only) */

	Y2_VAUX_AVAIL	= 1<<16,/* VAUX available (YUKON-2 only) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE