From 2c9b30a91fa7e4b24f491657fbf7d56a42b16e0a Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Sat, 28 Nov 2015 06:50:09 +0000 Subject: [PATCH] [ath_hal] use the correct revision information for QCA953x. This probe/attaches correctly in my local branch and now displays a useful message: ath0: at mem 0x18100000-0x1811ffff irq 0 on nexus0 ... ath0: AR9530 mac 1280.0 RF5110 phy 0.0 --- sys/dev/ath/ath_hal/ah.c | 5 +---- sys/dev/ath/ath_hal/ar9003/ar9300_devid.h | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/ath/ath_hal/ah.c b/sys/dev/ath/ath_hal/ah.c index 5d6c27d99d1c..4d3ac3d4ec32 100644 --- a/sys/dev/ath/ath_hal/ah.c +++ b/sys/dev/ath/ath_hal/ah.c @@ -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"; } diff --git a/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h b/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h index 8d0a39a4cbda..00ceeb82aecf 100644 --- a/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h +++ b/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h @@ -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 */