diff options
author | Ethan Lee <flibitijibibo@gmail.com> | 2018-06-01 14:46:08 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-06-04 16:31:22 -0400 |
commit | c1ba08390a8bb13c927e699330896adc15b78205 (patch) | |
tree | 53d74c584ab49badfa87adfbf5e3452875555d47 | |
parent | 22a844b853684a9f6088ede15114f8b286b49560 (diff) |
Input: xpad - add GPD Win 2 Controller USB IDs
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: Ethan Lee <flibitijibibo@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/joystick/xpad.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index f5d2b5147dd4..48e36acbeb49 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
@@ -125,6 +125,7 @@ static const struct xpad_device { | |||
125 | u8 mapping; | 125 | u8 mapping; |
126 | u8 xtype; | 126 | u8 xtype; |
127 | } xpad_device[] = { | 127 | } xpad_device[] = { |
128 | { 0x0079, 0x18d4, "GPD Win 2 Controller", 0, XTYPE_XBOX360 }, | ||
128 | { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, | 129 | { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, |
129 | { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, | 130 | { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, |
130 | { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, | 131 | { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, |
@@ -411,6 +412,7 @@ static const signed short xpad_abs_triggers[] = { | |||
411 | 412 | ||
412 | static const struct usb_device_id xpad_table[] = { | 413 | static const struct usb_device_id xpad_table[] = { |
413 | { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ | 414 | { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ |
415 | XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ | ||
414 | XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ | 416 | XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ |
415 | XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ | 417 | XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ |
416 | XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ | 418 | XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ |