From owner-svn-src-all@FreeBSD.ORG  Wed Oct 31 21:14:25 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id DFC7890C;
 Wed, 31 Oct 2012 21:14:25 +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 C34358FC16;
 Wed, 31 Oct 2012 21:14:25 +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 q9VLEP9q032231;
 Wed, 31 Oct 2012 21:14:25 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9VLEPiT032228;
 Wed, 31 Oct 2012 21:14:25 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201210312114.q9VLEPiT032228@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 31 Oct 2012 21:14:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242412 - head/sys/dev/ath/ath_hal/ar9001
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 31 Oct 2012 21:14:26 -0000

Author: adrian
Date: Wed Oct 31 21:14:25 2012
New Revision: 242412
URL: http://svn.freebsd.org/changeset/base/242412

Log:
  Since the PLL changes aren't in here yet for the AR9130 half/quarter
  rate support, disable it.

Modified:
  head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
  head/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c

Modified: head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c	Wed Oct 31 21:06:55 2012	(r242411)
+++ head/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c	Wed Oct 31 21:14:25 2012	(r242412)
@@ -301,6 +301,13 @@ ar9130FillCapabilityInfo(struct ath_hal 
 	/* BB Read WAR */
 	pCap->halHasBBReadWar = AH_TRUE;
 
+	/*
+	 * Implement the PLL/config changes needed for half/quarter
+	 * rates before re-enabling them here.
+	 */
+	pCap->halChanHalfRate = AH_FALSE;
+	pCap->halChanQuarterRate = AH_FALSE;
+
 	return AH_TRUE;
 }
 

Modified: head/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c	Wed Oct 31 21:06:55 2012	(r242411)
+++ head/sys/dev/ath/ath_hal/ar9001/ar9130_phy.c	Wed Oct 31 21:14:25 2012	(r242412)
@@ -33,6 +33,9 @@ ar9130InitPLL(struct ath_hal *ah, const 
 
 	uint32_t pll;
 
+	/*
+	 * XXX TODO: support half/quarter rates
+	 */
 	if (chan && IEEE80211_IS_CHAN_5GHZ(chan))
 		pll = 0x1450;
 	else