svn commit: r268586 - stable/10/sys/dev/usb/wlan

[Kevin Lo]

Author: kevlo
Date: Sun Jul 13 15:13:25 2014
New Revision: 268586
URL: http://svnweb.freebsd.org/changeset/base/268586

Log:
  MFC r268487:
  
  Enable 8051 before downloading firmware.
  
  Tested by:	Carlos Jacobo Puga Medina <cpm at fbsd dot es

Modified:
  stable/10/sys/dev/usb/wlan/if_urtwn.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- stable/10/sys/dev/usb/wlan/if_urtwn.c	Sun Jul 13 10:38:01 2014	(r268585)
+++ stable/10/sys/dev/usb/wlan/if_urtwn.c	Sun Jul 13 15:13:25 2014	(r268586)
@@ -2280,9 +2280,6 @@ urtwn_fw_reset(struct urtwn_softc *sc)
 	}
 	/* Force 8051 reset. */
 	urtwn_write_2(sc, R92C_SYS_FUNC_EN, reg & ~R92C_SYS_FUNC_EN_CPUEN);
-	urtwn_write_2(sc, R92C_SYS_FUNC_EN,
-	    urtwn_read_2(sc, R92C_SYS_FUNC_EN) |
-	    R92C_SYS_FUNC_EN_CPUEN);
 }
 
 static void
@@ -2382,6 +2379,11 @@ urtwn_load_firmware(struct urtwn_softc *
 		urtwn_write_1(sc, R92C_MCUFWDL, 0);
 	}
 
+	if (!(sc->chip & URTWN_CHIP_88E)) {
+		urtwn_write_2(sc, R92C_SYS_FUNC_EN,
+		    urtwn_read_2(sc, R92C_SYS_FUNC_EN) |
+		    R92C_SYS_FUNC_EN_CPUEN);
+	}
 	urtwn_write_1(sc, R92C_MCUFWDL,
 	    urtwn_read_1(sc, R92C_MCUFWDL) | R92C_MCUFWDL_EN);
 	urtwn_write_1(sc, R92C_MCUFWDL + 2,