From owner-svn-src-head@FreeBSD.ORG  Sat May 14 15:24:16 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 261D81065670;
	Sat, 14 May 2011 15:24:16 +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 1655B8FC17;
	Sat, 14 May 2011 15:24:16 +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 p4EFOF89007405;
	Sat, 14 May 2011 15:24:15 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4EFOFLs007403;
	Sat, 14 May 2011 15:24:15 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105141524.p4EFOFLs007403@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 14 May 2011 15:24:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221897 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 May 2011 15:24:16 -0000

Author: adrian
Date: Sat May 14 15:24:15 2011
New Revision: 221897
URL: http://svn.freebsd.org/changeset/base/221897

Log:
  Fix the Merlin 5ghz fast-clock EEPROM fetch to return the correct value.
  
  The eeprom Get method should return HAL_OK if fastclock is enabled in the
  EEPROM. It was returning the opposite of what it should have.
  
  Submitted by:	Matthew Fleming <mdf356@gmail.com>

Modified:
  head/sys/dev/ath/ath_hal/ah_eeprom_v14.c

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_v14.c	Sat May 14 15:12:02 2011	(r221896)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.c	Sat May 14 15:24:15 2011	(r221897)
@@ -84,8 +84,10 @@ v14EepromGet(struct ath_hal *ah, int par
 		return IS_VERS(>=, AR5416_EEP_MINOR_VER_19) ?
 		    pBase->txGainType : AR5416_EEP_TXGAIN_ORIG;
 	case AR_EEP_FSTCLK_5G:
-		return IS_VERS(>, AR5416_EEP_MINOR_VER_16) ?
-		    pBase->fastClk5g : AH_TRUE;
+		/* 5ghz fastclock is always enabled for Merlin minor <= 16 */
+		if (IS_VERS(<=, AR5416_EEP_MINOR_VER_16))
+			return HAL_OK;
+		return pBase->fastClk5g ? HAL_OK : HAL_EIO;
 	case AR_EEP_OL_PWRCTRL:
 		HALASSERT(val == AH_NULL);
 		return pBase->openLoopPwrCntl ?  HAL_OK : HAL_EIO;