Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cbf2611 authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_htc: Add new devices into AR7010 



Treat new PIDs (0xA704, 0x1200) as AR7010 devices.

Cc: stable@kernel.org
Signed-off-by: default avatarRajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 32b08955

drivers/net/wireless/ath/ath9k/hif_usb.c

+4 −0
Original line number Diff line number Diff line
@@ -811,6 +811,8 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) 
	case 0x7010:

	case 0x7015:

	case 0x9018:

	case 0xA704:

	case 0x1200:

		firm_offset = AR7010_FIRMWARE_TEXT;

		break;

	default:
@@ -933,6 +935,8 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface, 
	case 0x7010:

	case 0x7015:

	case 0x9018:

	case 0xA704:

	case 0x1200:

		if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)

			hif_dev->fw_name = FIRMWARE_AR7010_1_1;

		else

drivers/net/wireless/ath/ath9k/htc_drv_init.c

+2 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid) 
	case 0x7010:

	case 0x7015:

	case 0x9018:

	case 0xA704:

	case 0x1200:

		priv->htc->credits = 45;

		break;

	default:

drivers/net/wireless/ath/ath9k/reg.h

+3 −1
Original line number Diff line number Diff line
@@ -866,7 +866,9 @@ 
#define AR_DEVID_7010(_ah) \

	(((_ah)->hw_version.devid == 0x7010) || \

	 ((_ah)->hw_version.devid == 0x7015) || \

	 ((_ah)->hw_version.devid == 0x9018))

	 ((_ah)->hw_version.devid == 0x9018) || \

	 ((_ah)->hw_version.devid == 0xA704) || \

	 ((_ah)->hw_version.devid == 0x1200))



#define AR_RADIO_SREV_MAJOR                   0xf0

#define AR_RAD5133_SREV_MAJOR                 0xc0