From patchwork Tue Dec 1 08:52:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 335114 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp5492218ilb; Tue, 1 Dec 2020 01:11:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFGK9NfN5gZ+RcWjyk0KBhHRE29xh4TWHd6QHHVsetG51B2nZHhJWVKwbAF8e5x+BUoS9o X-Received: by 2002:aa7:c44d:: with SMTP id n13mr2071568edr.138.1606813899911; Tue, 01 Dec 2020 01:11:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606813899; cv=none; d=google.com; s=arc-20160816; b=Yvlre+5SFZ62FE2anKw7fybgyHGJBBcNN8W/a2qg/RLPPp45UhPRWgC4aYbzm5Yiwd v85rk9pn6TvtwK0B+2zXIvRkjgqZ2B2FuKfefKop8PXwv7PLWkI8XB5HFI02fZbWfeRL O8I7mhtGliHWlx6Y4/x7kfPU5Idk8UFlCKdwU4kmIpG850I2t3WRunzbDJGYToqcITIA fOeLhvkkluaETJAUR0ziwUcFapckF9ZogX9uso7T5d5Ss3uyFpwIgsK/RlCynm7MBzxY QvLO0QfsTnta3dH9ASeHJg7yBhdIavGZSvbzjOJvaNQKI3hRQSTISx3vhF51h78VoZ4n W+3A== 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=9DbWkldzpq3s5LEbQTrGIEyxtdJeua3mJ2UsxdlWdL8=; b=fEqUcOiFS49Tit74JQGxECeHSmIswpPsURK19uKjhjHSKy0yW+019zDaZEBA0zC0TW dKfDm5Wtmo0MP/GG3ikr0Ga3dIi56Vzf4kz1TutugshjcU2NBVhM3OWvnvv159k3+Rxy LljE9Lyp4pyKxlRY9SlOsh+h60cJ9XsuiTHkGgyaPEKKhcay99R1mEWYBJRGlFguQIbv ENPIlpxr0Sk12h8zYXnA/ri6Q0QnJ2sC5uwLh386oWuFTPRlUswB+08NvDh8djIR/UpC fePyUooAtfTKek2o0iHR8olsITPkcgccXKfJo5mcJ2ZvJrycoZfa91d6EjLZRPg8DbIR uEng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=k8SM60so; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 c26si754070edv.182.2020.12.01.01.11.38; Tue, 01 Dec 2020 01:11:39 -0800 (PST) Received-SPF: pass (google.com: domain of stable-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=k8SM60so; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S2389757AbgLAJKq (ORCPT + 14 others); Tue, 1 Dec 2020 04:10:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:48134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389754AbgLAJKo (ORCPT ); Tue, 1 Dec 2020 04:10:44 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A6DD206C1; Tue, 1 Dec 2020 09:10:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1606813828; bh=T5rnfp3F3wYg2Pn8TDnxMX2cqai5pwu2xJg82n5oltc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k8SM60soUD2B3YP6/P8iaC6OmrOwsxNg1Kw6CVkOzuGftWTCLLmY/fHlGgZmNWZRZ hDGfx4Nt4JBXDB2zk1NdJG12/7l6UHaehdtNoy+lRzhT3CWydkbVEiXznXVc54KGTE G3QtungYJ0ASZI2N1n5QUGPn9CAnC5MwBShoIdnA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Ye , Jiri Kosina , Sasha Levin Subject: [PATCH 5.9 046/152] HID: add HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE for Gamevice devices Date: Tue, 1 Dec 2020 09:52:41 +0100 Message-Id: <20201201084717.928840094@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201201084711.707195422@linuxfoundation.org> References: <20201201084711.707195422@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chris Ye [ Upstream commit f59ee399de4a8ca4d7d19cdcabb4b63e94867f09 ] Kernel 5.4 introduces HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE, devices need to be set explicitly with this flag. Signed-off-by: Chris Ye Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-ids.h | 4 ++++ drivers/hid/hid-quirks.c | 4 ++++ 2 files changed, 8 insertions(+) -- 2.27.0 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 6d6c961f8fee7..96e84a51f6b2c 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -445,6 +445,10 @@ #define USB_VENDOR_ID_FRUCTEL 0x25B6 #define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002 +#define USB_VENDOR_ID_GAMEVICE 0x27F8 +#define USB_DEVICE_ID_GAMEVICE_GV186 0x0BBE +#define USB_DEVICE_ID_GAMEVICE_KISHI 0x0BBF + #define USB_VENDOR_ID_GAMERON 0x0810 #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001 #define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR 0x0002 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index b154e11d43bfa..bf7ecab5d9e5e 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -85,6 +85,10 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_FUTABA, USB_DEVICE_ID_LED_DISPLAY), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_SAT_ADAPTOR), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD), HID_QUIRK_MULTI_INPUT }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_GV186), + HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_KISHI), + HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },