Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b9accbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Add support for CH Pro Throttle
  HID: hid-magicmouse: Increase evdev buffer size
  HID: add FF support for Logitech G25/G27
  HID: roccat: Add support for wireless variant of Pyra
  HID: Fix typo Keyoutch -> Keytouch
  HID: add support for Skycable 0x3f07 wireless presenter
parents 7e3bf1d3 da60325d

drivers/hid/Kconfig

+10 −3
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ config HID_EZKEY 
	Support for Ezkey BTC 8193 keyboard.



config HID_KEYTOUCH

	tristate "Keyoutch HID devices"

	tristate "Keytouch HID devices"

	depends on USB_HID

	---help---

	Support for Keytouch HID devices not fully compliant with
@@ -340,10 +340,17 @@ config HID_NTRIG 
	Support for N-Trig touch screen.



config HID_ORTEK

	tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad"

	tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad"

	depends on USB_HID

	---help---

	Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad.

	There are certain devices which have LogicalMaximum wrong in the keyboard

	usage page of their report descriptor. The most prevailing ones so far

	are manufactured by Ortek, thus the name of the driver. Currently

	supported devices by this driver are



	   - Ortek PKB-1700

	   - Ortek WKB-2000

	   - Skycable wireless presenter



config HID_PANTHERLORD

	tristate "Pantherlord/GreenAsia game controller"

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1449,8 +1449,10 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONEPLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ 
#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01



#define USB_VENDOR_ID_CH		0x068e

#define USB_DEVICE_ID_CH_PRO_THROTTLE	0x00f1

#define USB_DEVICE_ID_CH_PRO_PEDALS	0x00f2

#define USB_DEVICE_ID_CH_COMBATSTICK	0x00f4

#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051
@@ -524,6 +525,9 @@ 
#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001

#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE	0x0600



#define USB_VENDOR_ID_SKYCABLE			0x1223

#define	USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER	0x3F07



#define USB_VENDOR_ID_SONY			0x054c

#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b

#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268

drivers/hid/hid-lgff.c

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ static const struct dev_type devices[] = { 
	{ 0x046d, 0xc293, ff_joystick },

	{ 0x046d, 0xc294, ff_wheel },

	{ 0x046d, 0xc295, ff_joystick },

	{ 0x046d, 0xc298, ff_wheel },

	{ 0x046d, 0xc299, ff_wheel },

	{ 0x046d, 0xca03, ff_wheel },

};

drivers/hid/hid-magicmouse.c

+2 −0
Original line number Diff line number Diff line
@@ -418,6 +418,8 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h 
			input_set_abs_params(input, ABS_MT_POSITION_Y, -2456,

				2565, 4, 0);

		}



		input_set_events_per_packet(input, 60);

	}



	if (report_undeciphered) {