svn commit: r291418 - in head/sys/dev/ath/ath_hal: . ar9003

[Adrian Chadd]

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 */