Skip to content

Commit 96f2f66

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina: - rumble support for Xbox One S, from Andrey Smirnov - high-resolution support for Logitech mice, from Harry Cutts - support for recent devices requiring the HID parse to be able to cope with tag report sizes > 256 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (35 commits) HID: usbhid: Add quirk for Redragon/Dragonrise Seymur 2 HID: wacom: Work around HID descriptor bug in DTK-2451 and DTH-2452 HID: google: add dependency on Cros EC for Hammer HID: elan: fix spelling mistake "registred" -> "registered" HID: google: drop superfluous const before SIMPLE_DEV_PM_OPS() HID: google: add support tablet mode switch for Whiskers mfd: cros: add "base attached" MKBP switch definition Input: reserve 2 events code because of HID HID: magicmouse: add support for Apple Magic Trackpad 2 HID: i2c-hid: override HID descriptors for certain devices HID: hid-bigbenff: driver for BigBen Interactive PS3OFMINIPAD gamepad HID: logitech: fix a used uninitialized GCC warning HID: intel-ish-hid: using list_head for ipc write queue HID: intel-ish-hid: use resource-managed api HID: intel_ish-hid: Enhance API to get ring buffer sizes HID: intel-ish-hid: use helper function to search client id HID: intel-ish-hid: ishtp: add helper function for client search HID: intel-ish-hid: use helper function to access client buffer HID: intel-ish-hid: ishtp: add helper functions for client buffer operation HID: intel-ish-hid: use helper function for private driver data set/get ...
2 parents 3f2dcb6 + 46011e9 commit 96f2f66

32 files changed

+2225
-245
lines changed

‎Documentation/input/event-codes.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,16 @@ A few EV_REL codes have special meanings:
190190
* REL_WHEEL, REL_HWHEEL:
191191

192192
- These codes are used for vertical and horizontal scroll wheels,
193-
respectively.
193+
respectively. The value is the number of "notches" moved on the wheel, the
194+
physical size of which varies by device. For high-resolution wheels (which
195+
report multiple events for each notch of movement, or do not have notches)
196+
this may be an approximation based on the high-resolution scroll events.
197+
198+
* REL_WHEEL_HI_RES:
199+
200+
- If a vertical scroll wheel supports high-resolution scrolling, this code
201+
will be emitted in addition to REL_WHEEL. The value is the (approximate)
202+
distance travelled by the user's finger, in microns.
194203

195204
EV_ABS
196205
------

‎drivers/hid/Kconfig

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,19 @@ config HID_BETOP_FF
182182
Currently the following devices are known to be supported:
183183
- BETOP 2185 PC & BFM MODE
184184

185+
config HID_BIGBEN_FF
186+
tristate "BigBen Interactive Kids' gamepad support"
187+
depends on USB_HID
188+
depends on NEW_LEDS
189+
depends on LEDS_CLASS
190+
select INPUT_FF_MEMLESS
191+
default !EXPERT
192+
help
193+
Support for the "Kid-friendly Wired Controller" PS3OFMINIPAD
194+
gamepad made by BigBen Interactive, originally sold as a PS3
195+
accessory. This driver fixes input mapping and adds support for
196+
force feedback effects and LEDs on the device.
197+
185198
config HID_CHERRY
186199
tristate "Cherry Cymotion keyboard"
187200
depends on HID
@@ -351,7 +364,7 @@ config HOLTEK_FF
351364

352365
config HID_GOOGLE_HAMMER
353366
tristate "Google Hammer Keyboard"
354-
depends on USB_HID && LEDS_CLASS
367+
depends on USB_HID && LEDS_CLASS && MFD_CROS_EC
355368
---help---
356369
Say Y here if you have a Google Hammer device.
357370

@@ -596,6 +609,7 @@ config HID_MICROSOFT
596609
tristate "Microsoft non-fully HID-compliant devices"
597610
depends on HID
598611
default !EXPERT
612+
select INPUT_FF_MEMLESS
599613
---help---
600614
Support for Microsoft devices that are not fully compliant with HID standard.
601615

‎drivers/hid/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ obj-$(CONFIG_HID_ASUS) += hid-asus.o
3131
obj-$(CONFIG_HID_AUREAL) += hid-aureal.o
3232
obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
3333
obj-$(CONFIG_HID_BETOP_FF) += hid-betopff.o
34+
obj-$(CONFIG_HID_BIGBEN_FF) += hid-bigbenff.o
3435
obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
3536
obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
3637
obj-$(CONFIG_HID_CMEDIA) += hid-cmedia.o

0 commit comments

Comments
 (0)