From patchwork Sat Mar 25 22:31:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Gutman X-Patchwork-Id: 9644891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5ABC76020B for ; Sat, 25 Mar 2017 22:31:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F6D627FA0 for ; Sat, 25 Mar 2017 22:31:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3475927FAC; Sat, 25 Mar 2017 22:31:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE7C227FA0 for ; Sat, 25 Mar 2017 22:31:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751309AbdCYWbd (ORCPT ); Sat, 25 Mar 2017 18:31:33 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35229 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751114AbdCYWbc (ORCPT ); Sat, 25 Mar 2017 18:31:32 -0400 Received: by mail-pg0-f65.google.com with SMTP id g2so4195653pge.2; Sat, 25 Mar 2017 15:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NG0KtGISjJUv4sNra/11+IU999R7muEHjkawLKCcObY=; b=XkcDdipNtVXu3YtAdN9HoUpVIh0Ol7Tr/4M9KFukTR+wAxH1zrb4oGHljHRyen5cG3 Rl591Y/yhrapNkP2IbPMA/Bb/7o5AG1CZK8HL2pxz0lk8jMgrtPwU8bnGsWPsFlDPrnK tepecOz1qNzqWKEMVgoyv2LR6EQEoYLYPNTr9QU/wBPCxn6HafrYcTEku/l/HGG821K4 hK2RMTdmsEtM1G6O0J3bLk/nziVS5sTn+40UhGPtOCVIfNE7C70mAJKXmeSApPTkltB8 sPQakIvcG6giW8tkb9JEV2LbHtQvmOYknGjXjgStE/pVknfiA/nycMnm0iFBQo9LrV6r CGvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NG0KtGISjJUv4sNra/11+IU999R7muEHjkawLKCcObY=; b=QJVywj+PyJvwVZR8d3nsDhkpfpOqQB5mmcEB2yR1RcqWLJVvce7yq6yxb5ss6RN33O DJeYULmeAKCOtjxSDxTYrjzPlaNF1u6Ggu/3zT2cpXsl/4SlYgedjuzc1t/+iFGCeFxy 4obA7lcKmkKIHPIw9Xt+8SRi1Kmrgr1iRHpbROrvNCJom/Uxx4Wx0RFL6fca+E5ZP5cZ YXnqQE2IElIlDMguhrFwLrXkZ0jyjPhVtoAwb7yfzdk05Y/RbQIBXgKOj9ArPW9YZn4D ChOO5hy7rxAZnLKnmj0DPpUgl2wHc8lX9VyKOY5HXvOMMy3RbgyE4hS1pWkCWpnkFk5C bCLQ== X-Gm-Message-State: AFeK/H3FowBZLIS8iAgaVw05tie5ES/rJ0iChvs1ov9KbTl8vtmyk8zT6nuOwFnDYaiWZg== X-Received: by 10.98.110.193 with SMTP id j184mr16903880pfc.228.1490481076574; Sat, 25 Mar 2017 15:31:16 -0700 (PDT) Received: from localhost.localdomain ([174.127.240.168]) by smtp.gmail.com with ESMTPSA id b10sm12317529pga.39.2017.03.25.15.31.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Mar 2017 15:31:16 -0700 (PDT) From: Cameron Gutman To: dmitry.torokhov@gmail.com, rojtberg@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Cameron Gutman , stable@vger.kernel.org Subject: [PATCH 2/2] Input: xpad - add support for Razer Wildcat gamepad Date: Sat, 25 Mar 2017 15:31:02 -0700 Message-Id: <20170325223102.21136-3-aicommander@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170325223102.21136-1-aicommander@gmail.com> References: <20170325223102.21136-1-aicommander@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: stable@vger.kernel.org Signed-off-by: Cameron Gutman --- 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 efb798a..5c3d249 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -202,6 +202,7 @@ static const struct xpad_device { { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 }, { 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 }, + { 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE }, { 0x15e4, 0x3f00, "Power A Mini Pro Elite", 0, XTYPE_XBOX360 }, { 0x15e4, 0x3f0a, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 }, { 0x15e4, 0x3f10, "Batarang Xbox 360 controller", 0, XTYPE_XBOX360 }, @@ -326,6 +327,7 @@ static struct usb_device_id xpad_table[] = { XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */ XPAD_XBOX360_VENDOR(0x1532), /* Razer Sabertooth */ + XPAD_XBOXONE_VENDOR(0x1532), /* Razer Wildcat */ XPAD_XBOX360_VENDOR(0x15e4), /* Numark X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */