Commit 270fdc07 authored by Herton Ronaldo Krzesinski's avatar Herton Ronaldo Krzesinski Committed by Jiri Kosina
Browse files

HID: add support for Ortek PKB-1700

As reported on http://ubuntuforums.org/showthread.php?t=1594007

 the
PKB-1700 needs same special handling as WKB-2000. This change is
originally based on patch posted by user asmoore82 on the Ubuntu
forums.

Cc: stable@kernel.org
Signed-off-by: default avatarHerton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 2d9ca4e9
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -319,10 +319,10 @@ config HID_NTRIG
	Support for N-Trig touch screen.

config HID_ORTEK
	tristate "Ortek WKB-2000 wireless keyboard and mouse trackpad"
	tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad"
	depends on USB_HID
	---help---
	Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.
	Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad.

config HID_PANTHERLORD
	tristate "Pantherlord/GreenAsia game controller"
+1 −0
Original line number Diff line number Diff line
@@ -1400,6 +1400,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },
+1 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@
#define USB_DEVICE_ID_ONTRAK_ADU100	0x0064

#define USB_VENDOR_ID_ORTEK		0x05a4
#define USB_DEVICE_ID_ORTEK_PKB1700	0x1700
#define USB_DEVICE_ID_ORTEK_WKB2000	0x2000

#define USB_VENDOR_ID_PANJIT		0x134c
+2 −1
Original line number Diff line number Diff line
/*
 *  HID driver for Ortek WKB-2000 (wireless keyboard + mouse trackpad).
 *  HID driver for Ortek PKB-1700/WKB-2000 (wireless keyboard + mouse trackpad).
 *  Fixes LogicalMaximum error in USB report description, see
 *  http://bugzilla.kernel.org/show_bug.cgi?id=14787
 *
@@ -30,6 +30,7 @@ static __u8 *ortek_report_fixup(struct hid_device *hdev, __u8 *rdesc,
}

static const struct hid_device_id ortek_devices[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
	{ }
};