From owner-svn-src-user@FreeBSD.ORG  Thu Nov  3 05:44:00 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 912C4106566B;
	Thu,  3 Nov 2011 05:44:00 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 80F3C8FC17;
	Thu,  3 Nov 2011 05:44:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pA35i0DS055183;
	Thu, 3 Nov 2011 05:44:00 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pA35i0Ut055179;
	Thu, 3 Nov 2011 05:44:00 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201111030544.pA35i0Ut055179@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 3 Nov 2011 05:44:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227054 -
	user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Nov 2011 05:44:00 -0000

Author: adrian
Date: Thu Nov  3 05:44:00 2011
New Revision: 227054
URL: http://svn.freebsd.org/changeset/base/227054

Log:
  Add a PLL init call, matching what the reference driver does when
  waking up the NIC after a total shutdown.
  
  Obtained from:	Atheros

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_power.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_power.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_power.c	Thu Nov  3 05:35:31 2011	(r227053)
+++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_power.c	Thu Nov  3 05:44:00 2011	(r227054)
@@ -36,7 +36,7 @@
 static HAL_BOOL
 ar5416SetPowerModeAwake(struct ath_hal *ah, int setChip)
 {
-#define	POWER_UP_TIME	200000
+#define	POWER_UP_TIME	10000
 	uint32_t val;
 	int i = 0;
 
@@ -50,6 +50,7 @@ ar5416SetPowerModeAwake(struct ath_hal *
 			& AR_RTC_PM_STATUS_M) == AR_RTC_STATUS_SHUTDOWN) {
 			if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON))
 				goto bad;			
+			ar5416InitPLL(ah, AH_NULL);
 		}
 
 		if (AR_SREV_HOWL(ah))