diff options
Diffstat (limited to 'drivers/bluetooth/btusb.c')
-rw-r--r-- | drivers/bluetooth/btusb.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index cef3bac1a543..654e248763ef 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -52,6 +52,9 @@ static struct usb_device_id btusb_table[] = { | |||
52 | /* Generic Bluetooth USB device */ | 52 | /* Generic Bluetooth USB device */ |
53 | { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, | 53 | { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, |
54 | 54 | ||
55 | /* Apple-specific (Broadcom) devices */ | ||
56 | { USB_VENDOR_AND_INTERFACE_INFO(0x05ac, 0xff, 0x01, 0x01) }, | ||
57 | |||
55 | /* Broadcom SoftSailing reporting vendor specific */ | 58 | /* Broadcom SoftSailing reporting vendor specific */ |
56 | { USB_DEVICE(0x0a5c, 0x21e1) }, | 59 | { USB_DEVICE(0x0a5c, 0x21e1) }, |
57 | 60 | ||
@@ -94,16 +97,14 @@ static struct usb_device_id btusb_table[] = { | |||
94 | 97 | ||
95 | /* Broadcom BCM20702A0 */ | 98 | /* Broadcom BCM20702A0 */ |
96 | { USB_DEVICE(0x0489, 0xe042) }, | 99 | { USB_DEVICE(0x0489, 0xe042) }, |
97 | { USB_DEVICE(0x0a5c, 0x21e3) }, | ||
98 | { USB_DEVICE(0x0a5c, 0x21e6) }, | ||
99 | { USB_DEVICE(0x0a5c, 0x21e8) }, | ||
100 | { USB_DEVICE(0x0a5c, 0x21f3) }, | ||
101 | { USB_DEVICE(0x0a5c, 0x21f4) }, | ||
102 | { USB_DEVICE(0x413c, 0x8197) }, | 100 | { USB_DEVICE(0x413c, 0x8197) }, |
103 | 101 | ||
104 | /* Foxconn - Hon Hai */ | 102 | /* Foxconn - Hon Hai */ |
105 | { USB_DEVICE(0x0489, 0xe033) }, | 103 | { USB_DEVICE(0x0489, 0xe033) }, |
106 | 104 | ||
105 | /*Broadcom devices with vendor specific id */ | ||
106 | { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) }, | ||
107 | |||
107 | { } /* Terminating entry */ | 108 | { } /* Terminating entry */ |
108 | }; | 109 | }; |
109 | 110 | ||
@@ -141,6 +142,7 @@ static struct usb_device_id blacklist_table[] = { | |||
141 | 142 | ||
142 | /* Atheros AR5BBU12 with sflash firmware */ | 143 | /* Atheros AR5BBU12 with sflash firmware */ |
143 | { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 }, | 144 | { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 }, |
145 | { USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 }, | ||
144 | 146 | ||
145 | /* Broadcom BCM2035 */ | 147 | /* Broadcom BCM2035 */ |
146 | { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU }, | 148 | { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU }, |