Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 76e5127884f0..792e32d29a1d 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -46,6 +46,9 @@ static const struct sdio_device_id btsdio_table[] = {
         /* Generic Bluetooth Type-B SDIO device */
         { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_B) },
 
+        /* Generic Bluetooth AMP controller */
+        { SDIO_DEVICE_CLASS(SDIO_CLASS_BT_AMP) },
+
         { }     /* Terminating entry */
 };
 
@@ -329,6 +332,11 @@ static int btsdio_probe(struct sdio_func *func,
         hdev->bus = HCI_SDIO;
         hdev->driver_data = data;
 
+        if (id->class == SDIO_CLASS_BT_AMP)
+                hdev->dev_type = HCI_AMP;
+        else
+                hdev->dev_type = HCI_BREDR;
+
         data->hdev = hdev;
 
         SET_HCIDEV_DEV(hdev, &func->dev);