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

Commit cb6b5869 authored by Ethan Lee's avatar Ethan Lee Committed by Greg Kroah-Hartman
Browse files

Input: xpad - add GPD Win 2 Controller USB IDs 

commit c1ba08390a8bb13c927e699330896adc15b78205 upstream.

GPD Win 2 Website: http://www.gpd.hk/gpdwin2.asp



Tested on a unit from the first production run sent to Indiegogo backers

Signed-off-by: default avatarEthan Lee <flibitijibibo@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c2e9e9b

drivers/input/joystick/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static const struct xpad_device { 
	u8 mapping;

	u8 xtype;

} xpad_device[] = {

	{ 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 },

	{ 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
@@ -411,6 +412,7 @@ static const signed short xpad_abs_triggers[] = { 


static const struct usb_device_id xpad_table[] = {

	{ USB_INTERFACE_INFO('X', 'B', 0) },	/* X-Box USB-IF not approved class */

	XPAD_XBOX360_VENDOR(0x0079),		/* GPD Win 2 Controller */

	XPAD_XBOX360_VENDOR(0x044f),		/* Thrustmaster X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x045e),		/* Microsoft X-Box 360 controllers */

	XPAD_XBOXONE_VENDOR(0x045e),		/* Microsoft X-Box One controllers */