summaryrefslogtreecommitdiff
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2010-08-09 17:42:21 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2010-10-12 12:44:51 -0300
commitfb3d8eb47ce377d6d7a8fc58b8046ea9eb376a28 (patch)
treef39c407dc40a881d2502d195c655674d51995ce8 /drivers/bluetooth
parent8f1e1742233cd1c3444dfc6c945a2efb2814e157 (diff)
downloadlinux-3.10-fb3d8eb47ce377d6d7a8fc58b8046ea9eb376a28.tar.gz
linux-3.10-fb3d8eb47ce377d6d7a8fc58b8046ea9eb376a28.tar.bz2
linux-3.10-fb3d8eb47ce377d6d7a8fc58b8046ea9eb376a28.zip
Bluetooth: Support SDIO devices that are AMP controllers
Signed-off-by: David Vrabel <david.vrabel@csr.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btsdio.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 76e5127884f..792e32d29a1 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);