From patchwork Tue Dec 1 08:53:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 335110 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp5485463ilb; Tue, 1 Dec 2020 01:01:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/uS1VYcNFwI96o8Dmfbvx4vaLoj3WcOLDPMLz4xoN9vdxaYFoDRtOwEpQb1BE8VA787Uw X-Received: by 2002:a05:6402:1452:: with SMTP id d18mr1861999edx.15.1606813301809; Tue, 01 Dec 2020 01:01:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606813301; cv=none; d=google.com; s=arc-20160816; b=e298BeKWaLOmAX4VemfWCJLuvHgKSQCGyZhm2K/sybOUNt/61J9GlNtoezrlrM6dRM ucRvGpPo3qx2SJ7uH2NxUlLivCp3+60bRU/QdS2Bt8Rz270Oxm6aypZ3fuvI55Oua7AJ SuETH3v6ltoT0SMz3bVFpRuWvGEvky6OyoIDbkrbtXxIvvDMdT3sIyyrmzM6j3+iBmTn K6Uc+9d+Pb8OntrrTgoJ11T3sVFvp32eOOgF5UDn+3v3V/YYmyVRY3zeMKWY4NWfbQyQ c9cXCbkLrkytMCPENH528+DTlMlGbX+yDD4prPWX2+PUUTS7zJgRANpVcuvD161HGksD vyKA== 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=0Pi5nZXXKfkrRrrG/A6jUijKQQY2c/dgslOoozl4EWM=; b=Xw/Lmv4QFOhujBKvLz5e56UuVr3Cgkd81fJHKRcB7JvEXvUdc0J64LnhzIrtNaQL05 WAybC+VzmDruTVXr+tX1eaEZhq6oDflU0EDisYGqN4lCBfTdP2H7WalTlKbp0RFkmcTA rz+ErxdQbX0BqGSm5A99GLdrfFyeWDzAnqwfSQS6LqYP5/QY47Yktk4ruM1vueDraAqn +ilRzK+Wwqz0RKNxC3hQwlJHv316g0B1MyLKpoL/XqsOzcEn1VZ3VaQZASYdMkVKe5g1 74FgM/432SI/1JQ4IQHNGRInalVFElYOWI79HecaM/cCTxrOrKxtiE4kvCxlwzyT4yD6 YmlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1ogG3rWO; 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 mf27si535893ejb.129.2020.12.01.01.01.41; Tue, 01 Dec 2020 01:01:41 -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=1ogG3rWO; 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 S2388380AbgLAJAm (ORCPT + 14 others); Tue, 1 Dec 2020 04:00:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:36796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388374AbgLAJAl (ORCPT ); Tue, 1 Dec 2020 04:00:41 -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 B5FE02222E; Tue, 1 Dec 2020 08:59:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1606813200; bh=ZeIzVfLco/GLm6tYbOevg3JIWmsCYliTX+lwwVPA2uE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1ogG3rWOSz9D7eyEQU/uYUONmMTO//FrKm+bkhEoFYXQaghZxctgjUbF1QQKQIVgW t3JBqOjRJT46pGtrYwe7SRjwI0PpVj7tY1G6E52IbhfzieJP2WTMFGYI/qpNRsQ7B5 eXPNDvt6qu51apMLXrvm4y93lgpVg/o/0YuNpFxU= 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 4.19 17/57] HID: add HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE for Gamevice devices Date: Tue, 1 Dec 2020 09:53:22 +0100 Message-Id: <20201201084649.707179761@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201201084647.751612010@linuxfoundation.org> References: <20201201084647.751612010@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 4d2a1d540a821..ad079aca68898 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -444,6 +444,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 493e2e7e12de0..10cb42a00fe87 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -87,6 +87,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 },