lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 67/92] Input: xpad - add GPD Win 2 Controller USB IDs
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit c1ba08390a8bb13c927e699330896adc15b78205 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/joystick/xpad.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
    index 5bf85c43e6d9..66cc37b41113 100644
    --- a/drivers/input/joystick/xpad.c
    +++ b/drivers/input/joystick/xpad.c
    @@ -128,6 +128,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 },
    @@ -414,6 +415,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 */
    --
    2.17.1


    \
     
     \ /
      Last update: 2018-11-29 15:51    [W:4.210 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site