From owner-svn-src-all@FreeBSD.ORG  Tue Mar 22 00:11:05 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 043CC106564A;
	Tue, 22 Mar 2011 00:11:05 +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 E83F58FC1B;
	Tue, 22 Mar 2011 00:11:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2M0B4rw029531;
	Tue, 22 Mar 2011 00:11:04 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2M0B4sW029529;
	Tue, 22 Mar 2011 00:11:04 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103220011.p2M0B4sW029529@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 22 Mar 2011 00:11:04 +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: r219851 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Mar 2011 00:11:05 -0000

Author: adrian
Date: Tue Mar 22 00:11:04 2011
New Revision: 219851
URL: http://svn.freebsd.org/changeset/base/219851

Log:
  Remove the merlin delay workaround here, it isn't appropriate for
  the analog bank writes as Merlin never does them.

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

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Mon Mar 21 23:59:20 2011	(r219850)
+++ head/sys/dev/ath/ath_hal/ah.c	Tue Mar 22 00:11:04 2011	(r219851)
@@ -976,12 +976,6 @@ ath_hal_ini_bank_write(struct ath_hal *a
 
 	for (r = 0; r < ia->rows; r++) {
 		OS_REG_WRITE(ah, HAL_INI_VAL(ia, r, 0), data[r]);
-
-		/* Analog shift register delay seems needed for Merlin - PR kern/154220 */
-		/* XXX verify whether any analog radio bank writes will hit up this */
-		/* XXX since this is a merlin work-around; and merlin doesn't use radio banks */
-		if (HAL_INI_VAL(ia, r, 0) >= 0x7800 && HAL_INI_VAL(ia, r, 0) < 0x78a0)
-			OS_DELAY(100);
 		DMA_YIELD(regWr);
 	}
 	return regWr;