brcmfmac: Add 43143 USB support.
authorHante Meuleman <meuleman@broadcom.com>
Thu, 30 Aug 2012 17:43:01 +0000 (19:43 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 7 Sep 2012 19:03:43 +0000 (15:03 -0400)
Added usb device id to list of supported devices. 43143 is a new
802.11n single stream device.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmfmac/usb.c

index ecf3f7706d70d5d353b7e43501e5d67c25362354..78fb17e63eb701439fb1ee6683a4c1be0365f519 100644 (file)
@@ -66,6 +66,7 @@
 #define BRCMF_USB_CBCTL_READ   1
 #define BRCMF_USB_MAX_PKT_SIZE 1600
 
+#define BRCMF_USB_43143_FW_NAME        "brcm/brcmfmac43143.bin"
 #define BRCMF_USB_43236_FW_NAME        "brcm/brcmfmac43236b.bin"
 #define BRCMF_USB_43242_FW_NAME        "brcm/brcmfmac43242a.bin"
 
@@ -1113,6 +1114,8 @@ static int brcmf_usb_dlrun(struct brcmf_usbdev_info *devinfo)
 static bool brcmf_usb_chip_support(int chipid, int chiprev)
 {
        switch(chipid) {
+       case 43143:
+               return true;
        case 43235:
        case 43236:
        case 43238:
@@ -1232,6 +1235,9 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
                return 0;
 
        switch (devinfo->bus_pub.devid) {
+       case 43143:
+               fwname = BRCMF_USB_43143_FW_NAME;
+               break;
        case 43235:
        case 43236:
        case 43238:
@@ -1592,11 +1598,13 @@ static int brcmf_usb_resume(struct usb_interface *intf)
 }
 
 #define BRCMF_USB_VENDOR_ID_BROADCOM   0x0a5c
+#define BRCMF_USB_DEVICE_ID_43143      0xbd1e
 #define BRCMF_USB_DEVICE_ID_43236      0xbd17
 #define BRCMF_USB_DEVICE_ID_43242      0xbd1f
 #define BRCMF_USB_DEVICE_ID_BCMFW      0x0bdc
 
 static struct usb_device_id brcmf_usb_devid_table[] = {
+       { USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_43143) },
        { USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_43236) },
        { USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_43242) },
        /* special entry for device with firmware loaded and running */
@@ -1604,6 +1612,7 @@ static struct usb_device_id brcmf_usb_devid_table[] = {
        { }
 };
 MODULE_DEVICE_TABLE(usb, brcmf_usb_devid_table);
+MODULE_FIRMWARE(BRCMF_USB_43143_FW_NAME);
 MODULE_FIRMWARE(BRCMF_USB_43236_FW_NAME);
 MODULE_FIRMWARE(BRCMF_USB_43242_FW_NAME);