diff options
| author | Ismael Luceno <ismael@iodev.co.uk> | 2016-08-22 18:40:07 -0400 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-09-03 13:01:03 -0400 |
| commit | bccf3ffc8c6d8e0251a15541bb4d12b423c4f729 (patch) | |
| tree | 3dffb621b8a0e44c7d66444f5b981d300c4f28e7 /drivers/net/wireless/broadcom | |
| parent | 0c9d3491530773858ff9d705ec2a9c382f449230 (diff) | |
brcmfmac: Add USB ID for Cisco Linksys AE1200
The AE1200 comes with different revisions of the BCM43235 chipset,
but all have the same USB ID. Only revision 3 can be supported.
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/broadcom')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c index fa26619a7945..2f978a39b58a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | |||
| @@ -1458,11 +1458,15 @@ static int brcmf_usb_reset_resume(struct usb_interface *intf) | |||
| 1458 | #define BRCMF_USB_DEVICE(dev_id) \ | 1458 | #define BRCMF_USB_DEVICE(dev_id) \ |
| 1459 | { USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id) } | 1459 | { USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id) } |
| 1460 | 1460 | ||
| 1461 | #define LINKSYS_USB_DEVICE(dev_id) \ | ||
| 1462 | { USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id) } | ||
| 1463 | |||
| 1461 | static struct usb_device_id brcmf_usb_devid_table[] = { | 1464 | static struct usb_device_id brcmf_usb_devid_table[] = { |
| 1462 | BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID), | 1465 | BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID), |
| 1463 | BRCMF_USB_DEVICE(BRCM_USB_43236_DEVICE_ID), | 1466 | BRCMF_USB_DEVICE(BRCM_USB_43236_DEVICE_ID), |
| 1464 | BRCMF_USB_DEVICE(BRCM_USB_43242_DEVICE_ID), | 1467 | BRCMF_USB_DEVICE(BRCM_USB_43242_DEVICE_ID), |
| 1465 | BRCMF_USB_DEVICE(BRCM_USB_43569_DEVICE_ID), | 1468 | BRCMF_USB_DEVICE(BRCM_USB_43569_DEVICE_ID), |
| 1469 | LINKSYS_USB_DEVICE(BRCM_USB_43235_LINKSYS_DEVICE_ID), | ||
| 1466 | { USB_DEVICE(BRCM_USB_VENDOR_ID_LG, BRCM_USB_43242_LG_DEVICE_ID) }, | 1470 | { USB_DEVICE(BRCM_USB_VENDOR_ID_LG, BRCM_USB_43242_LG_DEVICE_ID) }, |
| 1467 | /* special entry for device with firmware loaded and running */ | 1471 | /* special entry for device with firmware loaded and running */ |
| 1468 | BRCMF_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID), | 1472 | BRCMF_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID), |
diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h index 3cc42bef6245..d0407d9ad782 100644 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c | 23 | #define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c |
| 24 | #define BRCM_USB_VENDOR_ID_LG 0x043e | 24 | #define BRCM_USB_VENDOR_ID_LG 0x043e |
| 25 | #define BRCM_USB_VENDOR_ID_LINKSYS 0x13b1 | ||
| 25 | #define BRCM_PCIE_VENDOR_ID_BROADCOM PCI_VENDOR_ID_BROADCOM | 26 | #define BRCM_PCIE_VENDOR_ID_BROADCOM PCI_VENDOR_ID_BROADCOM |
| 26 | 27 | ||
| 27 | /* Chipcommon Core Chip IDs */ | 28 | /* Chipcommon Core Chip IDs */ |
| @@ -58,6 +59,7 @@ | |||
| 58 | 59 | ||
| 59 | /* USB Device IDs */ | 60 | /* USB Device IDs */ |
| 60 | #define BRCM_USB_43143_DEVICE_ID 0xbd1e | 61 | #define BRCM_USB_43143_DEVICE_ID 0xbd1e |
| 62 | #define BRCM_USB_43235_LINKSYS_DEVICE_ID 0x0039 | ||
| 61 | #define BRCM_USB_43236_DEVICE_ID 0xbd17 | 63 | #define BRCM_USB_43236_DEVICE_ID 0xbd17 |
| 62 | #define BRCM_USB_43242_DEVICE_ID 0xbd1f | 64 | #define BRCM_USB_43242_DEVICE_ID 0xbd1f |
| 63 | #define BRCM_USB_43242_LG_DEVICE_ID 0x3101 | 65 | #define BRCM_USB_43242_LG_DEVICE_ID 0x3101 |
