From owner-svn-src-all@freebsd.org  Sat Nov 28 06:50:11 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61DACA3BB2F;
 Sat, 28 Nov 2015 06:50:11 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1FF491C6B;
 Sat, 28 Nov 2015 06:50:11 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAS6oAEB041336;
 Sat, 28 Nov 2015 06:50:10 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAS6oAZw041334;
 Sat, 28 Nov 2015 06:50:10 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201511280650.tAS6oAZw041334@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 28 Nov 2015 06:50:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291418 - in head/sys/dev/ath/ath_hal: . ar9003
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.20
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Nov 2015 06:50:11 -0000

Author: adrian
Date: Sat Nov 28 06:50:09 2015
New Revision: 291418
URL: https://svnweb.freebsd.org/changeset/base/291418

Log:
  [ath_hal] use the correct revision information for QCA953x.
  
  This probe/attaches correctly in my local branch and now displays
  a useful message:
  
  ath0: <Qualcomm Atheros QCA953x> at mem 0x18100000-0x1811ffff irq 0 on nexus0
  ...
  ath0: AR9530 mac 1280.0 RF5110 phy 0.0

Modified:
  head/sys/dev/ath/ath_hal/ah.c
  head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Sat Nov 28 02:17:04 2015	(r291417)
+++ head/sys/dev/ath/ath_hal/ah.c	Sat Nov 28 06:50:09 2015	(r291418)
@@ -145,10 +145,7 @@ ath_hal_mac_name(struct ath_hal *ah)
 	case AR_SREV_VERSION_QCA9565:
 		/* XXX should say QCA, not AR */
 		return "9565";
-	case AR9300_DEVID_QCA955X:
-		/* XXX should say QCA, not AR */
-		return "9550";
-	case AR9300_DEVID_QCA953X:
+	case AR_SREV_VERSION_QCA9530:
 		/* XXX should say QCA, not AR */
 		return "9530";
 	}

Modified: head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h	Sat Nov 28 02:17:04 2015	(r291417)
+++ head/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h	Sat Nov 28 06:50:09 2015	(r291418)
@@ -54,6 +54,7 @@
 #define	AR_SREV_VERSION_AR9340		0x300
 #define	AR_SREV_VERSION_QCA9550		0x400
 #define	AR_SREV_VERSION_AR9485		0x240
+#define	AR_SREV_VERSION_QCA9530		0x500
 
 #define	AR_SREV_REVISION_AR9380_10	0	/* AR9380 1.0 */
 #define	AR_SREV_REVISION_AR9380_20	2	/* AR9380 2.0/2.1 */