Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid',... (019e129f) · Commits · e / devices / android_kernel_teracube_emerald

drivers/hid/Kconfig

+19 −0

Original line number	Diff line number	Diff line
		@@ -371,6 +371,7 @@ config HID_LOGITECH_DJ
		tristate "Logitech Unifying receivers full support"
		depends on HIDRAW
		depends on HID_LOGITECH
		select HID_LOGITECH_HIDPP
		---help---
		Say Y if you want support for Logitech Unifying receivers and devices.
		Unifying receivers are capable of pairing up to 6 Logitech compliant
		@@ -378,6 +379,17 @@ config HID_LOGITECH_DJ
		generic USB_HID driver and all incoming events will be multiplexed
		into a single mouse and a single keyboard device.

		config HID_LOGITECH_HIDPP
		tristate "Logitech HID++ devices support"
		depends on HID_LOGITECH
		---help---
		Support for Logitech devices relyingon the HID++ Logitech specification

		Say Y if you want support for Logitech devices relying on the HID++
		specification. Such devices are the various Logitech Touchpads (T650,
		T651, TK820), some mice (Zone Touch mouse), or even keyboards (Solar
		Keayboard).

		config LOGITECH_FF
		bool "Logitech force feedback support"
		depends on HID_LOGITECH
		@@ -613,6 +625,13 @@ config HID_PICOLCD_CIR
		---help---
		Provide access to PicoLCD's CIR interface via remote control (LIRC).

		config HID_PLANTRONICS
		tristate "Plantronics USB HID Driver"
		default !EXPERT
		depends on HID
		---help---
		Provides HID support for Plantronics telephony devices.

		config HID_PRIMAX
		tristate "Primax non-fully HID-compliant devices"
		depends on HID

drivers/hid/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ obj-$(CONFIG_HID_LCPOWER) += hid-lcpower.o
		obj-$(CONFIG_HID_LENOVO) += hid-lenovo.o
		obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o
		obj-$(CONFIG_HID_LOGITECH_DJ) += hid-logitech-dj.o
		obj-$(CONFIG_HID_LOGITECH_HIDPP) += hid-logitech-hidpp.o
		obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o
		obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o
		obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o
		@@ -94,6 +95,7 @@ ifdef CONFIG_DEBUG_FS
		hid-picolcd-y += hid-picolcd_debugfs.o
		endif

		obj-$(CONFIG_HID_PLANTRONICS) += hid-plantronics.o
		obj-$(CONFIG_HID_PRIMAX) += hid-primax.o
		obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o hid-roccat-common.o \
		hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \

drivers/hid/hid-core.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -702,6 +702,11 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
		if (((parser->global.usage_page << 16) == HID_UP_SENSOR) &&
		type == HID_COLLECTION_PHYSICAL)
		hid->group = HID_GROUP_SENSOR_HUB;

		if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
		hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 &&
		hid->group == HID_GROUP_MULTITOUCH)
		hid->group = HID_GROUP_GENERIC;
		}

		static int hid_scan_main(struct hid_parser parser, struct hid_item item)
		@@ -1277,12 +1282,6 @@ void hid_output_report(struct hid_report report, __u8 data)
		}
		EXPORT_SYMBOL_GPL(hid_output_report);

		static int hid_report_len(struct hid_report *report)
		{
		/* equivalent to DIV_ROUND_UP(report->size, 8) + !!(report->id > 0) */
		return ((report->size - 1) >> 3) + 1 + (report->id > 0);
		}

		/*
		* Allocator for buffer that is going to be passed to hid_output_report()
		*/
		@@ -1819,6 +1818,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RECEIVER) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_T651) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_DESKTOP) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_MINI) },
		@@ -1859,6 +1859,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) },
		@@ -1884,6 +1885,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_6000) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },
		#if IS_ENABLED(CONFIG_HID_ROCCAT)
		{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) },
		@@ -1912,6 +1914,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
		{ 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_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SMK_PS3_BDREMOTE) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },

drivers/hid/hid-ids.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -579,6 +579,7 @@

		#define USB_VENDOR_ID_LOGITECH 0x046d
		#define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e
		#define USB_DEVICE_ID_LOGITECH_T651 0xb00c
		#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
		#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110
		#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f
		@@ -651,6 +652,7 @@
		#define USB_DEVICE_ID_MS_SURFACE_PRO_2 0x0799
		#define USB_DEVICE_ID_MS_TOUCH_COVER_2 0x07a7
		#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
		#define USB_DEVICE_ID_MS_TYPE_COVER_3 0x07dc

		#define USB_VENDOR_ID_MOJO 0x8282
		#define USB_DEVICE_ID_RETRO_ADAPTER 0x3201
		@@ -718,6 +720,8 @@
		#define USB_DEVICE_ID_ORTEK_PKB1700 0x1700
		#define USB_DEVICE_ID_ORTEK_WKB2000 0x2000

		#define USB_VENDOR_ID_PLANTRONICS 0x047f

		#define USB_VENDOR_ID_PANASONIC 0x04da
		#define USB_DEVICE_ID_PANABOARD_UBT780 0x1044
		#define USB_DEVICE_ID_PANABOARD_UBT880 0x104d
		@@ -815,6 +819,9 @@
		#define USB_VENDOR_ID_SKYCABLE 0x1223
		#define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07

		#define USB_VENDOR_ID_SMK 0x0609
		#define USB_DEVICE_ID_SMK_PS3_BDREMOTE 0x0306

		#define USB_VENDOR_ID_SONY 0x054c
		#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b
		#define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE 0x0374
		@@ -933,6 +940,9 @@
		#define USB_DEVICE_ID_VERNIER_CYCLOPS 0x0004
		#define USB_DEVICE_ID_VERNIER_LCSPEC 0x0006

		#define USB_VENDOR_ID_VTL 0x0306
		#define USB_DEVICE_ID_VTL_MULTITOUCH_FF3F 0xff3f

		#define USB_VENDOR_ID_WACOM 0x056a
		#define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81
		#define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH 0x00BD

drivers/hid/hid-input.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1215,7 +1215,7 @@ static void hidinput_led_worker(struct work_struct *work)
		return hid->ll_driver->request(hid, report, HID_REQ_SET_REPORT);

		/* fall back to generic raw-output-report */
		len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
		len = hid_report_len(report);
		buf = hid_alloc_report_buf(report, GFP_KERNEL);
		if (!buf)
		return;