Commit fdf93aa3 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: support for Kensington slimblade device 



0x47d/0x2041 device sends two extra buttons in 0xff00 usage
page and therefore requires special handling.

Reported-by: default avatarJason Noble <nobleja@polezero.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 3f866fbd

drivers/hid/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -150,6 +150,13 @@ config HID_GYRATION 
	---help---

	Support for Gyration remote control.



config HID_KENSINGTON

	tristate "Kensington" if EMBEDDED

	depends on USB_HID

	default !EMBEDDED

	---help---

	Support for Kensington Slimblade Trackball.



config HID_LOGITECH

	tristate "Logitech" if EMBEDDED

	depends on USB_HID

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o 
obj-$(CONFIG_DRAGONRISE_FF)	+= hid-drff.o

obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o

obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o

obj-$(CONFIG_HID_KENSINGTON)	+= hid-kensington.o

obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1270,6 +1270,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0012) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },

drivers/hid/hid-dummy.c

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ static int __init hid_dummy_init(void) 
#ifdef CONFIG_HID_GYRATION_MODULE

	HID_COMPAT_CALL_DRIVER(gyration);

#endif

#ifdef CONFIG_HID_KENSINGTON_MODULE

	HID_COMPAT_CALL_DRIVER(kensington);

#endif

#ifdef CONFIG_HID_LOGITECH_MODULE

	HID_COMPAT_CALL_DRIVER(logitech);

#endif

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -274,6 +274,9 @@ 
#define USB_DEVICE_ID_LD_POWERCONTROL	0x2030

#define USB_DEVICE_ID_LD_MACHINETEST	0x2040



#define USB_VENDOR_ID_KENSINGTON	0x047d

#define USB_DEVICE_ID_KS_SLIMBLADE	0x2041



#define USB_VENDOR_ID_LOGITECH		0x046d

#define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101

#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110