From owner-svn-src-head@freebsd.org  Sat Nov 28 00:27:17 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 ECDE3A3627E;
 Sat, 28 Nov 2015 00:27:17 +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 B644018FE;
 Sat, 28 Nov 2015 00:27:17 +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 tAS0RG6l026562;
 Sat, 28 Nov 2015 00:27:16 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAS0RGtW026560;
 Sat, 28 Nov 2015 00:27:16 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201511280027.tAS0RGtW026560@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 00:27:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291413 - head/sys/dev/ath/ath_hal
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Nov 2015 00:27:18 -0000

Author: adrian
Date: Sat Nov 28 00:27:16 2015
New Revision: 291413
URL: https://svnweb.freebsd.org/changeset/base/291413

Log:
  * Add device string for QCA955x (scorpion);
  * Add device ID and device string for QCA953x (honeybee).

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

Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c	Sat Nov 28 00:14:37 2015	(r291412)
+++ head/sys/dev/ath/ath_hal/ah.c	Sat Nov 28 00:27:16 2015	(r291413)
@@ -145,6 +145,12 @@ 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:
+		/* XXX should say QCA, not AR */
+		return "9530";
 	}
 	return "????";
 }

Modified: head/sys/dev/ath/ath_hal/ah_devid.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_devid.h	Sat Nov 28 00:14:37 2015	(r291412)
+++ head/sys/dev/ath/ath_hal/ah_devid.h	Sat Nov 28 00:27:16 2015	(r291413)
@@ -94,6 +94,7 @@
 #define	AR9300_DEVID_QCA9565		0x0036
 #define	AR9300_DEVID_AR1111_PCIE	0x0037
 #define	AR9300_DEVID_QCA955X		0x0039
+#define	AR9300_DEVID_QCA953X		0x003d        /* Honey Bee */
 
 #define	AR_SUBVENDOR_ID_NOG	0x0e11		/* No 11G subvendor ID */
 #define AR_SUBVENDOR_ID_NEW_A	0x7065		/* Update device to new RD */