Commit e8403b49 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 

Pull HID updates from Jiri Kosina:

 - 3rd generation Wacom Intuos BT device support from Aaron Armstrong
   Skomra

 - support for NSG-MR5U and NSG-MR7U devices from Todd Kelner

 - multitouch Razer Blade Stealth support from Benjamin Tissoires

 - Elantech touchpad support from Alexandrov Stansilav

 - a few other scattered-around fixes and cleanups to drivers and
   generic code

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (31 commits)
  HID: google: Enable PM Full On mode when adjusting backlight
  HID: google: add google hammer HID driver
  HID: core: reset the quirks before calling probe again
  HID: multitouch: do not set HID_QUIRK_NO_INIT_REPORTS
  HID: core: remove the need for HID_QUIRK_NO_EMPTY_INPUT
  HID: use BIT() macro for quirks too
  HID: use BIT macro instead of plain integers for flags
  HID: multitouch: remove dead zones of Razer Blade Stealth
  HID: multitouch: export a quirk for the button handling of touchpads
  HID: usbhid: extend the polling interval configuration to keyboards
  HID: ntrig: document sysfs interface
  HID: wacom: wacom_wac_collection() is local to wacom_wac.c
  HID: wacom: generic: add the "Report Valid" usage
  HID: wacom: generic: Support multiple tools per report
  HID: wacom: Add support for 3rd generation Intuos BT
  HID: core: rewrite the hid-generic automatic unbind
  HID: sony: Add touchpad support for NSG-MR5U and NSG-MR7U remotes
  HID: hid-multitouch: Use true and false for boolean values
  HID: hid-ntrig: use true and false for boolean values
  HID: logitech-hidpp: document sysfs interface
  ...
parents e02d37bf 9931753b

Documentation/ABI/testing/sysfs-driver-hid-logitech-hidpp

0 → 100644
+19 −0
Original line number Diff line number Diff line 
What:		/sys/bus/hid/drivers/logitech-hidpp-device/<dev>/range

Date:		Jan, 2016

KernelVersion:	4.6

Contact:	linux-input@vger.kernel.org

Description:

		(RW) This attribute controls the amount of 'turn' permitted in

		Logitech G920 wheel. Reading from the file shows the current

		range of the steering wheel. Writing a value within the min and

		max boundary sets the range of the wheel.



What:		/sys/bus/hid/drivers/logitech-hidpp-device/<dev>/builtin_power_supply

Date:		Apr, 2017

KernelVersion:	4.12

Contact:	linux-input@vger.kernel.org

Description:

		Presence of this file indicates that HID++ driver is capable of

		handling battery properties in the kernel. This way, upower can

		add a udev rule to decide whether or not it should use the

		internal unifying support or the generic kernel one.

Documentation/ABI/testing/sysfs-driver-hid-ntrig

0 → 100644
+70 −0
Original line number Diff line number Diff line 
What:		/sys/bus/hid/drivers/ntrig/<dev>/activate_slack

Date:		May, 2010

KernelVersion:	2.6.35

Contact:	linux-input@vger.kernel.org

Description:

		(RW) Number of contact frames ignored before acknowledging the

		start of activity (activating touch).





What:		/sys/bus/hid/drivers/ntrig/<dev>/decativate_slack

Date:		May, 2010

KernelVersion:	2.6.35

Contact:	linux-input@vger.kernel.org

Description:

		(RW) Number of empty (no contact) frames ignored before

		acknowledging the end of activity (deactivating touch).



		When the last finger is removed from the device, it sends a

		number of empty frames. By holding off on deactivation for a few

		frames false erroneous disconnects can be tolerated, where the

		sensor may mistakenly not detect a finger that is still present.





What:		/sys/bus/hid/drivers/ntrig/<dev>/activation_width

What:		/sys/bus/hid/drivers/ntrig/<dev>/activation_height

Date:		May, 2010

KernelVersion:	2.6.35

Contact:	linux-input@vger.kernel.org

Description:

		Threholds to override activation slack.



		activation_width:	(RW) Width threshold to immediately

					start processing touch events.



		activation_height:	(RW) Height threshold to immediately

					start processing touch events.





What:		/sys/bus/hid/drivers/ntrig/<dev>/min_width

What:		/sys/bus/hid/drivers/ntrig/<dev>/min_height

Date:		May, 2010

KernelVersion:	2.6.35

Contact:	linux-input@vger.kernel.org

Description:

		Minimum size contact accepted.



		min_width:	(RW) Minimum touch contact width to decide

				activation and activity.



		min_height:	(RW) Minimum touch contact height to decide

				activation and activity.





What:		/sys/bus/hid/drivers/ntrig/<dev>/sensor_physical_width

What:		/sys/bus/hid/drivers/ntrig/<dev>/sensor_physical_height

Date:		May, 2010

KernelVersion:	2.6.35

Contact:	linux-input@vger.kernel.org

Description:

		(RO) These are internal ranges not used for normal events but

		useful for tuning.





What:		/sys/bus/hid/drivers/ntrig/<dev>/sensor_logical_width

What:		/sys/bus/hid/drivers/ntrig/<dev>/sensor_logical_height

Date:		May, 2010

KernelVersion:	2.6.35

Contact:	linux-input@vger.kernel.org

Description:

		(RO) The range for positions reported during activity.

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -4456,6 +4456,9 @@ 
	usbhid.jspoll=

			[USBHID] The interval which joysticks are to be polled at.



	usbhid.kbpoll=

			[USBHID] The interval which keyboards are to be polled at.



	usb-storage.delay_use=

			[UMS] The delay in seconds before a new device is

			scanned for Logical Units (default 1).

drivers/hid/Kconfig

+17 −3
Original line number Diff line number Diff line
@@ -274,15 +274,23 @@ config HID_EMS_FF 
	Currently the following devices are known to be supported:

	 - Trio Linker Plus II



config HID_ELAN

	tristate "ELAN USB Touchpad Support"

	depends on LEDS_CLASS && USB_HID

	---help---

	Say Y to enable support for the USB ELAN touchpad

	Currently the following devices are known to be supported:

	 - HP Pavilion X2 10-p0XX.



config HID_ELECOM

	tristate "ELECOM HID devices"

	depends on HID

	---help---

	Support for ELECOM devices:

	  - BM084 Bluetooth Mouse

	  - EX-G Trackball (Wired and wireless)

	  - DEFT Trackball (Wired and wireless)

	  - HUGE Trackball (Wired and wireless)

	  - EX-G Trackballs (M-XT3DRBK, M-XT3URBK)

	  - DEFT Trackballs (M-DT1DRBK, M-DT1URBK, M-DT2DRBK, M-DT2URBK)

	  - HUGE Trackballs (M-HT1DRBK, M-HT1URBK)



config HID_ELO

	tristate "ELO USB 4000/4500 touchscreen"
@@ -331,6 +339,12 @@ config HOLTEK_FF 
	  Say Y here if you have a Holtek On Line Grip based game controller

	  and want to have force feedback support for it.



config HID_GOOGLE_HAMMER

	tristate "Google Hammer Keyboard"

	depends on USB_HID && LEDS_CLASS

	---help---

	Say Y here if you have a Google Hammer device.



config HID_GT683R

	tristate "MSI GT68xR LED support"

	depends on LEDS_CLASS && USB_HID

drivers/hid/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -39,11 +39,13 @@ obj-$(CONFIG_HID_CP2112) += hid-cp2112.o 
obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o

obj-$(CONFIG_HID_DRAGONRISE)	+= hid-dr.o

obj-$(CONFIG_HID_EMS_FF)	+= hid-emsff.o

obj-$(CONFIG_HID_ELAN)		+= hid-elan.o

obj-$(CONFIG_HID_ELECOM)	+= hid-elecom.o

obj-$(CONFIG_HID_ELO)		+= hid-elo.o

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

obj-$(CONFIG_HID_GEMBIRD)	+= hid-gembird.o

obj-$(CONFIG_HID_GFRM)		+= hid-gfrm.o

obj-$(CONFIG_HID_GOOGLE_HAMMER)	+= hid-google-hammer.o

obj-$(CONFIG_HID_GT683R)	+= hid-gt683r.o

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

obj-$(CONFIG_HID_HOLTEK)	+= hid-holtek-kbd.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE