diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-03-13 12:36:05 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-13 12:36:05 +0400 |
| commit | 740363fb75f421f9a00a183f673b477c3029b572 (patch) | |
| tree | fea529ddf1a72eb85c8a3819600417e1ea86df4b | |
| parent | 6b1968d5b6e223237bca98879f31c5616b3b325f (diff) | |
| download | linux-740363fb75f421f9a00a183f673b477c3029b572.tar.xz | |
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>
| -rw-r--r-- | drivers/hid/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-tivo.c | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 838fa6a3a287..3d14e4f6bac1 100644 --- 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 fbecdd3e7cd3..95095e5568a4 100644 --- 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 afe878f36ec3..5dcda615da36 100644 --- 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 3d43c06dfffa..de47039c708c 100644 --- 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) }, { } }; |