From owner-svn-src-head@FreeBSD.ORG  Sat May 21 09:23:19 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 1A6B4106566B;
	Sat, 21 May 2011 09:23:19 +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 0A5388FC08;
	Sat, 21 May 2011 09:23:19 +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 p4L9NImf022995;
	Sat, 21 May 2011 09:23:18 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4L9NILL022992;
	Sat, 21 May 2011 09:23:18 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105210923.p4L9NILL022992@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 21 May 2011 09:23:18 +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: r222157 - in head/sys/dev/ath/ath_hal: . ar9002
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, 21 May 2011 09:23:19 -0000

Author: adrian
Date: Sat May 21 09:23:18 2011
New Revision: 222157
URL: http://svn.freebsd.org/changeset/base/222157

Log:
  The Merlin analog register bank is from 0x7800 -> 0x78fc; fix the code
  to reflect this.

Modified:
  head/sys/dev/ath/ath_hal/ah.c
  head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Sat May 21 01:44:13 2011	(r222156)
+++ head/sys/dev/ath/ath_hal/ah.c	Sat May 21 09:23:18 2011	(r222157)
@@ -1069,7 +1069,7 @@ ath_hal_ini_write(struct ath_hal *ah, co
 		    HAL_INI_VAL(ia, r, col));
 
 		/* Analog shift register delay seems needed for Merlin - PR kern/154220 */
-		if (HAL_INI_VAL(ia, r, 0) >= 0x7800 && HAL_INI_VAL(ia, r, 0) < 0x78a0)
+		if (HAL_INI_VAL(ia, r, 0) >= 0x7800 && HAL_INI_VAL(ia, r, 0) < 0x7900)
 			OS_DELAY(100);
 
 		DMA_YIELD(regWr);

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Sat May 21 01:44:13 2011	(r222156)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Sat May 21 09:23:18 2011	(r222157)
@@ -430,7 +430,7 @@ ar9280WriteIni(struct ath_hal *ah, const
 		OS_REG_WRITE(ah, reg, val);
 
 		/* Analog shift register delay seems needed for Merlin - PR kern/154220 */
-		if (reg >= 0x7800 && reg < 0x78a0)
+		if (reg >= 0x7800 && reg < 0x7900)
 			OS_DELAY(100);
 
 		DMA_YIELD(regWrites);