Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9eca242 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Wakeup hardware before loading firmware 



According to the legacy drivers the AUTOWAKEUP_CFG
register must be reset to 0 before loading the firmware.

Instead of during rt2800{pci,usb}_write_firmware it
must actually be done in rt2800_load_firmware() before
resetting the WPDMA_GLO_CFG and PWR_PIN_CFG registers.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3613884d

drivers/net/wireless/rt2x00/rt2800lib.c

+6 −0
Original line number Diff line number Diff line
@@ -384,6 +384,12 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev, 
	unsigned int i;

	u32 reg;



	/*

	 * If driver doesn't wake up firmware here,

	 * rt2800_load_firmware will hang forever when interface is up again.

	 */

	rt2800_register_write(rt2x00dev, AUTOWAKEUP_CFG, 0x00000000);



	/*

	 * Wait for stable hardware.

	 */

drivers/net/wireless/rt2x00/rt2800pci.c

+0 −2
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev, 
{

	u32 reg;



	rt2800_register_write(rt2x00dev, AUTOWAKEUP_CFG, 0x00000000);



	/*

	 * enable Host program ram write selection

	 */