diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-02 13:55:36 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-02 13:55:36 -0800 |
| commit | 2369afb6696c5a53772bfbc8b57b75dd40e46bfc (patch) | |
| tree | 182b849e356af91e15964e4bb3fde47579b2f117 /drivers/bluetooth/btusb.c | |
| parent | 9eb359140cd307f8a14f61c19b155ffca5291057 (diff) | |
| parent | 22eaf6c9946ae269061d95bb9ceee02524166474 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2019-03-02
Here's one more bluetooth-next pull request for the 5.1 kernel:
- Added support for MediaTek MT7663U and MT7668U UART devices
- Cleanups & fixes to the hci_qca driver
- Fixed wakeup pin behavior for QCA6174A controller
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index d4c8d989e714..ded198328f21 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2917,6 +2917,8 @@ static irqreturn_t btusb_oob_wake_handler(int irq, void *priv) static const struct of_device_id btusb_match_table[] = { { .compatible = "usb1286,204e" }, + { .compatible = "usbcf3,e300" }, /* QCA6174A */ + { .compatible = "usb4ca,301a" }, /* QCA6174A (Lite-On) */ { } }; MODULE_DEVICE_TABLE(of, btusb_match_table); |