Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4181211pxb; Mon, 8 Feb 2021 09:47:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJyuIRgTP3QEbDMLhRfC+xo37BmCdjwmSjwpEbjEpltTmUvxdJo8ZSj0esSLJaZFAe/gDFNC X-Received: by 2002:a17:906:2e0c:: with SMTP id n12mr18157822eji.312.1612806439947; Mon, 08 Feb 2021 09:47:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612806439; cv=none; d=google.com; s=arc-20160816; b=P5dgv7TkpMRY+uIWIlH9bDkWtSDCuBn7FHIrPNPcwgRiaCiUtpFnc24WIMDjkvc2xm 3c13iYeIGEKHYFT6XQpnrnhlfD6P8gZG+22ecgAkA65YRrZAfBGeVLKM7n+8m+20Wlti E56EhsyvgLJns5J1i8D++tHIksvVdiEY02mhHPq0/Haht+7YFYhbzHFzYEm7IMftKn65 2TyJ7+Y5WNgsDFbgVbyW6gUYOypgRr70aHQTqYu0h/cTzpZ9kck4yxj8GBGIplsJtN1F tmgnJs0o/SdCIsO1iWj6sCv1aGxnmxrw1vkC11HRUjFEWjsRLwa6DjsxqidiovRUmvJ3 uTiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ckFEWM+0Kuo1GsWdBKP+MwdmC/UsI8sYuleWGmKkHCQ=; b=mzWExJ9OtdH9bFAwx9KA58b8zkb9YDh6mnUV+Fv3nemydgEq4E5OOIPG3Lsq4cqyW0 mran+5SOwj70cBo1TlPgUANY5C9xGeIxhhfI+kryRz4aQ7bTIoucrSccWuv9hS4K2ZpO aIQbSQoFpnkIjQpd/CVQUz4QdLmmdMG92TLrD5C9qQ4x3vlkYn4wj/7UgUsM/IZEC/jj zVcunwgKkp8J7EMaWbHxlD+J5fxWPXcWN+6nkmQlU4nZHp2yKb7y72GaBkTFw6Dpo9ej 3oFvTHxzqWVt8sHdtAWN5buT5A69+kBkyScb2Vjj4glpwIGkmXiyAP3L0Wr9xXHLj36V Yu/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZDNLED1x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d1si11060566ejj.357.2021.02.08.09.46.53; Mon, 08 Feb 2021 09:47:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZDNLED1x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232475AbhBHRnj (ORCPT + 99 others); Mon, 8 Feb 2021 12:43:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:38266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232241AbhBHPa6 (ORCPT ); Mon, 8 Feb 2021 10:30:58 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8CC2964F34; Mon, 8 Feb 2021 15:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1612797442; bh=qCmDAzNUKnnrPGAkE+92nR9G9+zL+bKh5YZnLiw431k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZDNLED1x3sisZWN6fe0tsoptLpb2YmSG8kiQafzyVj6bM/fvpp6JO2XBm5vARTRO6 DbB7NA9dl2T9dyrJ0wY/5ZZBk2UePVDa+XT2LEYcTVaGIMvwuPdG10H6vBl+nx9o36 bTNiC/m2Un8ENYvzAdo9UNpNCacbDlzCPAYIqalc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Valentin , Dmitry Torokhov Subject: [PATCH 5.10 112/120] Input: xpad - sync supported devices with fork on GitHub Date: Mon, 8 Feb 2021 16:01:39 +0100 Message-Id: <20210208145822.843923170@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208145818.395353822@linuxfoundation.org> References: <20210208145818.395353822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benjamin Valentin commit 9bbd77d5bbc9aff8cb74d805c31751f5f0691ba8 upstream. There is a fork of this driver on GitHub [0] that has been updated with new device IDs. Merge those into the mainline driver, so the out-of-tree fork is not needed for users of those devices anymore. [0] https://github.com/paroj/xpad Signed-off-by: Benjamin Valentin Link: https://lore.kernel.org/r/20210121142523.1b6b050f@rechenknecht2k11 Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/joystick/xpad.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -215,9 +215,17 @@ static const struct xpad_device { { 0x0e6f, 0x0213, "Afterglow Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x021f, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE }, - { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a0, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a1, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a2, "PDP Wired Controller for Xbox One - Crimson Red", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a7, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a8, "PDP Xbox One Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02ad, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02b3, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02b8, "Afterglow Prismatic Wired Controller", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 }, @@ -296,6 +304,9 @@ static const struct xpad_device { { 0x1bad, 0xfa01, "MadCatz GamePad", 0, XTYPE_XBOX360 }, { 0x1bad, 0xfd00, "Razer Onza TE", 0, XTYPE_XBOX360 }, { 0x1bad, 0xfd01, "Razer Onza", 0, XTYPE_XBOX360 }, + { 0x20d6, 0x2001, "BDA Xbox Series X Wired Controller", 0, XTYPE_XBOXONE }, + { 0x20d6, 0x281f, "PowerA Wired Controller For Xbox 360", 0, XTYPE_XBOX360 }, + { 0x2e24, 0x0652, "Hyperkin Duke X-Box One pad", 0, XTYPE_XBOXONE }, { 0x24c6, 0x5000, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 }, { 0x24c6, 0x5303, "Xbox Airflo wired controller", 0, XTYPE_XBOX360 }, @@ -429,8 +440,12 @@ static const struct usb_device_id xpad_t XPAD_XBOX360_VENDOR(0x162e), /* Joytech X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x1689), /* Razer Onza */ XPAD_XBOX360_VENDOR(0x1bad), /* Harminix Rock Band Guitar and Drums */ + XPAD_XBOX360_VENDOR(0x20d6), /* PowerA Controllers */ + XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */ XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ + XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */ + XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */ { } };