Skip to content

Commit bc75450

Browse files
committed
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 ...
2 parents e6e3d8f + 179023e commit bc75450

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+9645
-672
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ Description: Displays a set of alternate modes supported by a wheel. Each
3535
DF-EX <*--------> G25 <-> G27
3636
DF-EX <*----------------> G27
3737

38+
G29:
39+
DF-EX <*> DFP <-> G25 <-> G27 <-> G29
40+
DF-EX <*--------> G25 <-> G27 <-> G29
41+
DF-EX <*----------------> G27 <-> G29
42+
DF-EX <*------------------------> G29
43+
3844
DFGT:
3945
DF-EX <*> DFP <-> DFGT
4046
DF-EX <*--------> DFGT
@@ -50,3 +56,12 @@ Description: Displays the real model of the wheel regardless of any
5056
alternate mode the wheel might be switched to.
5157
It is a read-only value.
5258
This entry is not created for devices that have only one mode.
59+
60+
What: /sys/bus/hid/drivers/logitech/<dev>/combine_pedals
61+
Date: Sep 2016
62+
KernelVersion: 4.9
63+
Contact: Simon Wood <[email protected]>
64+
Description: Controls whether a combined value of accelerator and brake is
65+
reported on the Y axis of the controller. Useful for older games
66+
which can do not work with separate accelerator/brake axis.
67+
Off ('0') by default, enabled by setting '1'.

Documentation/ABI/testing/sysfs-driver-wacom

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status0_luminance
2424
Date: August 2014
2525
2626
Description:
27+
<obsoleted by the LED class API now exported by the driver>
2728
Writing to this file sets the status LED luminance (1..127)
2829
when the stylus does not touch the tablet surface, and no
2930
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
3334
Date: August 2014
3435
3536
Description:
37+
<obsoleted by the LED class API now exported by the driver>
3638
Writing to this file sets the status LED luminance (1..127)
3739
when the stylus touches the tablet surface, or any button is
3840
pressed on the stylus.
@@ -41,6 +43,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_led/status_led0_select
4143
Date: August 2014
4244
4345
Description:
46+
<obsoleted by the LED class API now exported by the driver>
4447
Writing to this file sets which one of the four (for Intuos 4
4548
and Intuos 5) or of the right four (for Cintiq 21UX2 and Cintiq
4649
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
5053
Date: August 2014
5154
5255
Description:
56+
<obsoleted by the LED class API now exported by the driver>
5357
Writing to this file sets which one of the left four (for Cintiq 21UX2
5458
and Cintiq 24HD) status LEDs is active (0..3). The other three LEDs on
5559
the left are always inactive.
@@ -91,6 +95,7 @@ What: /sys/bus/hid/devices/<bus>:<vid>:<pid>.<n>/wacom_remote/<serial_number>/r
9195
Date: July 2015
9296
9397
Description:
98+
<obsoleted by the LED class API now exported by the driver>
9499
Reading from this file reports the mode status of the
95100
remote as indicated by the LED lights on the device. If no
96101
reports have been received from the paired device, reading

0 commit comments

Comments
 (0)