svn commit: r219851 - head/sys/dev/ath/ath_hal

[Adrian Chadd]

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;