Commit 5af06603 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid 

Pull HID updates from Jiri Kosina:

 - support for Nintendo Switch Pro Controllers and Joy-Cons (Daniel J.
   Ogorchock)

 - support for new revision of the NitroKey U2F device firmware (Andrej
   Shadura)

 - LED handling improvements for Sony Playstation5 controllers (Roderick
   Colenbrander)

 - support for Apple 2021 Magic Keyboard (Alex Henrie)

 - other assorted code cleanups and new device ID additions

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (41 commits)
  HID: nintendo: fix -Werror build
  HID: playstation: require multicolor LED functionality
  HID: u2fzero: properly handle timeouts in usb_submit_urb
  HID: u2fzero: clarify error check and length calculations
  HID: u2fzero: Support NitroKey U2F revision of the device
  HID: wacom: Make use of the helper function devm_add_action_or_reset()
  HID: wacom: Shrink critical section in `wacom_add_shared_data`
  HID: nintendo: prevent needless queueing of the rumble worker
  HID: nintendo: ratelimit subcommands and rumble
  HID: nintendo: improve rumble performance and stability
  HID: nintendo: add IMU support
  HID: nintendo: add support for reading user calibration
  HID: nintendo: add support for charging grip
  HID: nintendo: set controller uniq to MAC
  HID: nintendo: reduce device removal subcommand errors
  HID: nintendo: patch hw version for userspace HID mappings
  HID: nintendo: send subcommands after receiving input report
  HID: nintendo: improve subcommand reliability
  HID: nintendo: add rumble support
  HID: nintendo: add home led support
  ...
parents 5a1bcbd9 5a2506bb

Documentation/leds/well-known-leds.txt

+14 −0
Original line number Diff line number Diff line
@@ -16,6 +16,20 @@ but then try the legacy ones, too. 


Notice there's a list of functions in include/dt-bindings/leds/common.h .



* Gamepads and joysticks



Game controllers may feature LEDs to indicate a player number. This is commonly

used on game consoles in which multiple controllers can be connected to a system.

The "player LEDs" are then programmed with a pattern to indicate a particular

player. For example, a game controller with 4 LEDs, may be programmed with "x---"

to indicate player 1, "-x--" to indicate player 2 etcetera where "x" means on.

Input drivers can utilize the LED class to expose the individual player LEDs

of a game controller using the function "player".

Note: tracking and management of Player IDs is the responsibility of user space,

though drivers may pick a default value.



Good: "input*:*:player-{1,2,3,4,5}



* Keyboards

  

Good: "input*:*:capslock"

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -13434,6 +13434,12 @@ W: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/ 
F:	Documentation/scsi/NinjaSCSI.rst

F:	drivers/scsi/nsp32*









NINTENDO HID DRIVER









M:	Daniel J. Ogorchock <djogorchock@gmail.com>









L:	linux-input@vger.kernel.org









S:	Maintained









F:	drivers/hid/hid-nintendo*

















NIOS2 ARCHITECTURE









M:	Dinh Nguyen <dinguyen@kernel.org>









S:	Maintained
































drivers/hid/Kconfig



+32
−0






























Original line number
Diff line number
Diff line







@@ -468,6 +468,13 @@ config HID_VIEWSONIC







	help









	  Support for ViewSonic/Signotec PD1011 signature pad.



















config HID_XIAOMI









	tristate "Xiaomi"









	depends on HID









	help









	  Adds support for side buttons of Xiaomi Mi Dual Mode Wireless









	  Mouse Silent Edition.



















config HID_GYRATION









	tristate "Gyration remote control"









	depends on HID








@@ -731,6 +738,30 @@ config HID_MULTITOUCH







	  To compile this driver as a module, choose M here: the









	  module will be called hid-multitouch.



















config HID_NINTENDO









	tristate "Nintendo Joy-Con and Pro Controller support"









	depends on HID









	depends on NEW_LEDS









	depends on LEDS_CLASS









	select POWER_SUPPLY









	help









	Adds support for the Nintendo Switch Joy-Cons and Pro Controller.









	All controllers support bluetooth, and the Pro Controller also supports









	its USB mode.



















	To compile this driver as a module, choose M here: the









	module will be called hid-nintendo.



















config NINTENDO_FF









	bool "Nintendo Switch controller force feedback support"









	depends on HID_NINTENDO









	select INPUT_FF_MEMLESS









	help









	Say Y here if you have a Nintendo Switch controller and want to enable









	force feedback support for it. This works for both joy-cons and the pro









	controller. For the pro controller, both rumble motors can be controlled









	individually.



















config HID_NTI









	tristate "NTI keyboard adapters"









	help








@@ -868,6 +899,7 @@ config HID_PLANTRONICS







config HID_PLAYSTATION









	tristate "PlayStation HID Driver"









	depends on HID









	depends on LEDS_CLASS_MULTICOLOR









	select CRC32









	select POWER_SUPPLY









	help
































drivers/hid/Makefile



+2
−0






























Original line number
Diff line number
Diff line







@@ -78,6 +78,7 @@ obj-$(CONFIG_HID_MAYFLASH)	+= hid-mf.o







obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o









obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o









obj-$(CONFIG_HID_MULTITOUCH)	+= hid-multitouch.o









obj-$(CONFIG_HID_NINTENDO)	+= hid-nintendo.o









obj-$(CONFIG_HID_NTI)			+= hid-nti.o









obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o









obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o








@@ -125,6 +126,7 @@ hid-uclogic-objs		:= hid-uclogic-core.o \







obj-$(CONFIG_HID_UCLOGIC)	+= hid-uclogic.o









obj-$(CONFIG_HID_UDRAW_PS3)	+= hid-udraw-ps3.o









obj-$(CONFIG_HID_LED)		+= hid-led.o









obj-$(CONFIG_HID_XIAOMI)	+= hid-xiaomi.o









obj-$(CONFIG_HID_XINMO)		+= hid-xinmo.o









obj-$(CONFIG_HID_ZEROPLUS)	+= hid-zpff.o









obj-$(CONFIG_HID_ZYDACRON)	+= hid-zydacron.o
































drivers/hid/amd-sfh-hid/amd_sfh_client.c



+2
−1






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0-or-later









/*









 *  AMD SFH Client Layer









 *  Copyright 2020 Advanced Micro Devices, Inc.









 *  Copyright 2020-2021 Advanced Micro Devices, Inc.









 *  Authors: Nehal Bakulchandra Shah <Nehal-Bakulchandra.Shah@amd.com>









 *	     Sandeep Singh <Sandeep.singh@amd.com>









 *	     Basavaraj Natikar <Basavaraj.Natikar@amd.com>









 */



















#include <linux/dma-mapping.h>