From owner-svn-src-head@freebsd.org  Wed Jun  1 03:21:24 2016
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 5F928B56C32;
 Wed,  1 Jun 2016 03:21:24 +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 2FABD1EE8;
 Wed,  1 Jun 2016 03:21:24 +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 u513LNeL034610;
 Wed, 1 Jun 2016 03:21:23 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u513LNjZ034609;
 Wed, 1 Jun 2016 03:21:23 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201606010321.u513LNjZ034609@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: Wed, 1 Jun 2016 03:21:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301093 - head/sys/contrib/dev/ath/ath_hal/ar9300
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.22
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: Wed, 01 Jun 2016 03:21:24 -0000

Author: adrian
Date: Wed Jun  1 03:21:23 2016
New Revision: 301093
URL: https://svnweb.freebsd.org/changeset/base/301093

Log:
  [ath_hal] Allow the BT antenna diversity option to be enabled for QCA9565.
  
  Obtained from:	Linux ath9k

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c	Wed Jun  1 03:20:55 2016	(r301092)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c	Wed Jun  1 03:21:23 2016	(r301093)
@@ -2457,11 +2457,13 @@ static void
 ar9300_bt_coex_antenna_diversity(struct ath_hal *ah, u_int32_t value)
 {
     struct ath_hal_9300 *ahp = AH9300(ah);
-#if ATH_ANT_DIV_COMB    
+#if ATH_ANT_DIV_COMB
     //struct ath_hal_private *ahpriv = AH_PRIVATE(ah);
     const struct ieee80211_channel *chan = AH_PRIVATE(ah)->ah_curchan;
 #endif
 
+    HALDEBUG(ah, HAL_DEBUG_BT_COEX, "%s: called, value=%d\n", __func__, value);
+
     if (ahp->ah_bt_coex_flag & HAL_BT_COEX_FLAG_ANT_DIV_ALLOW)
     {
         if (ahp->ah_diversity_control == HAL_ANT_VARIABLE)
@@ -2494,7 +2496,7 @@ ar9300_bt_coex_set_parameter(struct ath_
             break;
 
         case HAL_BT_COEX_ANTENNA_DIVERSITY:
-            if (AR_SREV_POSEIDON(ah)) {
+            if (AR_SREV_POSEIDON(ah) || AR_SREV_APHRODITE(ah)) {
                 ahp->ah_bt_coex_flag |= HAL_BT_COEX_FLAG_ANT_DIV_ALLOW;
                 if (value) {
                     ahp->ah_bt_coex_flag |= HAL_BT_COEX_FLAG_ANT_DIV_ENABLE;