Commit bc75450c 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:

 - Integrated Sensor Hub support (Cherrytrail+) from Srinivas Pandruvada

 - Big cleanup of Wacom driver; namely it's now using devres, and the
   standardized LED API so that libinput doesn't need to have root
   access any more, with substantial amount of other cleanups
   piggy-backing on top. All this from Benjamin Tissoires

 - Report descriptor parsing would now ignore and out-of-range System
   controls in case of the application actually being System Control.
   This fixes quite some issues with several devices, and allows us to
   remove a few ->report_fixup callbacks. From Benjamin Tissoires

 - ... a lot of other assorted small fixes and device ID additions

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (76 commits)
  HID: add missing \n to end of dev_warn messages
  HID: alps: fix multitouch cursor issue
  HID: hid-logitech: Documentation updates/corrections
  HID: hid-logitech: Improve Wingman Formula Force GP support
  HID: hid-logitech: Rewrite of descriptor for all DF wheels
  HID: hid-logitech: Compute combined pedals value
  HID: hid-logitech: Add combined pedal support Logitech wheels
  HID: hid-logitech: Introduce control for combined pedals feature
  HID: sony: Update copyright and add Dualshock 4 rate control note
  HID: sony: Defer the initial USB Sixaxis output report
  HID: sony: Relax duplicate checking for USB-only devices
  Revert "HID: microsoft: fix invalid rdesc for 3k kbd"
  HID: alps: fix error return code in alps_input_configured()
  HID: alps: fix stick device not working after resume
  HID: support for keyboard - Corsair STRAFE
  HID: alps: Fix memory leak
  HID: uclogic: Add support for UC-Logic TWHA60 v3
  HID: uclogic: Override constant descriptors
  HID: uclogic: Support UGTizer GP0610 partially
  HID: uclogic: Add support for several more tablets
  ...
parents e6e3d8f8 179023e6

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

+15 −0
Original line number Diff line number Diff line
@@ -35,6 +35,12 @@ Description: Displays a set of alternate modes supported by a wheel. Each 
		  DF-EX <*--------> G25 <-> G27

		  DF-EX <*----------------> G27



		G29:

		  DF-EX <*> DFP <-> G25 <-> G27 <-> G29

		  DF-EX <*--------> G25 <-> G27 <-> G29

		  DF-EX <*----------------> G27 <-> G29

		  DF-EX <*------------------------> G29



		DFGT:

		  DF-EX <*> DFP <-> DFGT

		  DF-EX <*--------> DFGT
@@ -50,3 +56,12 @@ Description: Displays the real model of the wheel regardless of any 
		alternate mode the wheel might be switched to.

		It is a read-only value.

		This entry is not created for devices that have only one mode.



What:		/sys/bus/hid/drivers/logitech/<dev>/combine_pedals

Date:		Sep 2016

KernelVersion:	4.9

Contact:	Simon Wood <simon@mungewell.org>

Description:	Controls whether a combined value of accelerator and brake is

		reported on the Y axis of the controller. Useful for older games

		which can do not work with separate accelerator/brake axis.

		Off ('0') by default, enabled by setting '1'.

Documentation/ABI/testing/sysfs-driver-wacom

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status0_luminance 
Date:		August 2014

Contact:	linux-input@vger.kernel.org

Description:

		<obsoleted by the LED class API now exported by the driver>

		Writing to this file sets the status LED luminance (1..127)

		when the stylus does not touch the tablet surface, and no

		button is pressed on the stylus. This luminance level is
@@ -33,6 +34,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status1_luminance 
Date:		August 2014

Contact:	linux-input@vger.kernel.org

Description:

		<obsoleted by the LED class API now exported by the driver>

		Writing to this file sets the status LED luminance (1..127)

		when the stylus touches the tablet surface, or any button is

		pressed on the stylus.
@@ -41,6 +43,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status_led0_select 
Date:		August 2014

Contact:	linux-input@vger.kernel.org

Description:

		<obsoleted by the LED class API now exported by the driver>

		Writing to this file sets which one of the four (for Intuos 4

		and Intuos 5) or of the right four (for Cintiq 21UX2 and Cintiq

		24HD) status LEDs is active (0..3). The other three LEDs on the
@@ -50,6 +53,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status_led1_select 
Date:		August 2014

Contact:	linux-input@vger.kernel.org

Description:

		<obsoleted by the LED class API now exported by the driver>

		Writing to this file sets which one of the left four (for Cintiq 21UX2

		and Cintiq 24HD) status LEDs is active (0..3). The other three LEDs on

		the left are always inactive.
@@ -91,6 +95,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_remote/<serial_number>/r 
Date:		July 2015

Contact:	linux-input@vger.kernel.org

Description:

		<obsoleted by the LED class API now exported by the driver>

		Reading from this file reports the mode status of the

		remote as indicated by the LED lights on the device. If no

		reports have been received from the paired device, reading

Documentation/hid/intel-ish-hid.txt

0 → 100644
+454 −0

File added.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -6205,6 +6205,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git 
S:	Supported

F:	drivers/idle/intel_idle.c



INTEL INTEGRATED SENSOR HUB DRIVER

M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

M:	Jiri Kosina <jikos@kernel.org>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/intel-ish-hid/



INTEL PSTATE DRIVER

M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

M:	Len Brown <lenb@kernel.org>

drivers/hid/Kconfig

+17 −9
Original line number Diff line number Diff line
@@ -457,8 +457,6 @@ config LOGITECH_FF 
	  - Logitech WingMan Cordless RumblePad

	  - Logitech WingMan Cordless RumblePad 2

	  - Logitech WingMan Force 3D

	  - Logitech Formula Force EX

	  - Logitech WingMan Formula Force GP



	  and if you want to enable force feedback for them.

	  Note: if you say N here, this device will still be supported, but without
@@ -488,15 +486,22 @@ config LOGIWHEELS_FF 
	select INPUT_FF_MEMLESS

	default LOGITECH_FF

	help

	  Say Y here if you want to enable force feedback and range setting

	  Say Y here if you want to enable force feedback and range setting(*)

	  support for following Logitech wheels:

	  - Logitech G25 (*)

	  - Logitech G27 (*)

	  - Logitech G29 (*)

	  - Logitech Driving Force

	  - Logitech Driving Force Pro

	  - Logitech Driving Force GT

	  - Logitech G25

	  - Logitech G27

	  - Logitech MOMO/MOMO 2

	  - Logitech Formula Force EX

	  - Logitech Driving Force Pro (*)

	  - Logitech Driving Force GT (*)

	  - Logitech Driving Force EX/RX

	  - Logitech Driving Force Wireless

	  - Logitech Speed Force Wireless

	  - Logitech MOMO Force

	  - Logitech MOMO Racing Force

	  - Logitech Formula Force GP

	  - Logitech Formula Force EX/RX

	  - Logitech Wingman Formula Force GP



config HID_MAGICMOUSE

	tristate "Apple Magic Mouse/Trackpad multi-touch support"
@@ -862,6 +867,7 @@ config HID_WACOM 
	select POWER_SUPPLY

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGERS

	help

	  Say Y here if you want to use the USB or BT version of the Wacom Intuos

	  or Graphire tablet.
@@ -967,4 +973,6 @@ source "drivers/hid/usbhid/Kconfig" 


source "drivers/hid/i2c-hid/Kconfig"



source "drivers/hid/intel-ish-hid/Kconfig"



endmenu

CRA Git | Maintained and supported by SUSTech CRA and CCSE