HID: tivo: add support for BT-version (0x1200)

Add support for BT-driven configuration of the TiVo remote.

Reported-by: Joshua Dillon <jvdillon@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 838fa6a3a2879202d0b49b74b33dace0a79e138b..3d14e4f6bac10df5a2e5902dede68ebfc7abd603 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -610,7 +610,7 @@ config SMARTJOYPLUS_FF
 
 config HID_TIVO
        tristate "TiVo Slide Bluetooth remote control support"
-       depends on USB_HID
+       depends on (USB_HID || BT_HIDP)
        ---help---
        Say Y if you have a TiVo Slide Bluetooth remote control.
 

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index fbecdd3e7cd3dc2bf8b3fa6e27d3a6832a7a8bcf..95095e5568a4fa7bbc3bec65247b75793d3b8675 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1546,6 +1546,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index afe878f36ec3f6e664aab830ef7dfe40d2da0fa8..5dcda615da365f488e71c3727774d938865964de 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -661,6 +661,7 @@
 #define USB_VENDOR_ID_THRUSTMASTER     0x044f
 
 #define USB_VENDOR_ID_TIVO             0x150a
+#define USB_DEVICE_ID_TIVO_SLIDE_BT    0x1200
 #define USB_DEVICE_ID_TIVO_SLIDE       0x1201
 
 #define USB_VENDOR_ID_TOPSEED          0x0766

diff --git a/drivers/hid/hid-tivo.c b/drivers/hid/hid-tivo.c
index 3d43c06dfffa03f99bc7c65237a4d0e8ba1574fa..de47039c708c5546232bc1c05606d2a3e89b99d2 100644 (file)
--- a/drivers/hid/hid-tivo.c
+++ b/drivers/hid/hid-tivo.c
@@ -62,6 +62,7 @@ static int tivo_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 
 static const struct hid_device_id tivo_devices[] = {
        /* TiVo Slide Bluetooth remote, pairs with a Broadcom dongle */
+       { HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },
        { }
 };