Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 665aa807 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "FROMLIST: HID: nintendo: add nintendo switch controller driver"

parents c8f803bd 00f640e8

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -9591,6 +9591,12 @@ S: Maintained 
F:	Documentation/scsi/NinjaSCSI.txt

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:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

drivers/hid/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -609,6 +609,17 @@ 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

	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 HID_NTI

	tristate "NTI keyboard adapters"

	---help---

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,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

drivers/hid/hid-core.c

+10 −0
Original line number Diff line number Diff line
@@ -2259,6 +2259,16 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },

#endif

#if IS_ENABLED(CONFIG_HID_NINTENDO)

	{ HID_USB_DEVICE(USB_VENDOR_ID_NINTENDO,

		USB_DEVICE_ID_NINTENDO_PROCON) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,

		USB_DEVICE_ID_NINTENDO_PROCON) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,

		USB_DEVICE_ID_NINTENDO_JOYCONL) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,

		USB_DEVICE_ID_NINTENDO_JOYCONR) },

#endif

#if IS_ENABLED(CONFIG_HID_NTI)

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTI, USB_DEVICE_ID_USB_SUN) },

#endif

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -816,6 +816,9 @@ 
#define USB_VENDOR_ID_NINTENDO		0x057e

#define USB_DEVICE_ID_NINTENDO_WIIMOTE	0x0306

#define USB_DEVICE_ID_NINTENDO_WIIMOTE2	0x0330

#define USB_DEVICE_ID_NINTENDO_JOYCONL	0x2006

#define USB_DEVICE_ID_NINTENDO_JOYCONR	0x2007

#define USB_DEVICE_ID_NINTENDO_PROCON	0x2009



#define USB_VENDOR_ID_NOVATEK		0x0603

#define USB_DEVICE_ID_NOVATEK_PCT	0x0600