From patchwork Thu Oct 29 19:47:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ye X-Patchwork-Id: 11867433 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6EF156A2 for ; Thu, 29 Oct 2020 19:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3824520796 for ; Thu, 29 Oct 2020 19:47:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cp2RUY7e" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725862AbgJ2TrV (ORCPT ); Thu, 29 Oct 2020 15:47:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbgJ2TrV (ORCPT ); Thu, 29 Oct 2020 15:47:21 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C866BC0613D2 for ; Thu, 29 Oct 2020 12:47:19 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id x5so2502148qkn.2 for ; Thu, 29 Oct 2020 12:47:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=DM2UgOFHo//AreOdqVZsv1HPnyLVmD2DIdKtCbtXmYA=; b=cp2RUY7eGgson2wdDBb4suSeLc+awuv4u+/EZAbJNWm0LQ3S2aZwn0c4vvTsqhCWok 4Z/l13Fpehow2YX2GXT9NqdWN90xS7oWSOwCCx3xo2ajIJv++AqKXE8HzPJroJY2NuH/ b7ANTWDej7SN2Ab+PzJdijDIsWfkWUP443BoCi4sdO+3hO0cMHfnL/9QTa0jx0euLaaT H9w0b1rywB7bKPAq6Fgs6oQTFE/QSAWZhEmHFJZbyzbl853A772wyrYJ7UKhxiXYNIKH l6fwmzKeK9Z0fc7ZaH/sA/0JlzQWQ9HidumlUKyAwCrKuYyOBaJvunsnqBDgw/UmMVa4 3axw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=DM2UgOFHo//AreOdqVZsv1HPnyLVmD2DIdKtCbtXmYA=; b=DV5t7vJD5ZCgygz2Q4+6bX1fShRaheCmRC5QaOKx/bNPP/60pxVXCD1vSZLJ+bB/Yw Viqu9O5wxYubIItc9r/LTXdqifLeth1XDvMRHypnAcG6PS1Onb5HJPgnEfzB0J/5OjIo FWYI46IVeADxRvX2xGRBCNPDwK4ZSmjFCeQeZbySZ8UQfcPVMl8poXrw0XHjtabA7zP/ +ayR075CNDgbhqODgEfJLfWae3FhvC84i4cvONYWaeippIhIaR5oqsCoA+BZKhrtnmHd gVoH7tKRtvxceogg7ryp6/JUTKaR8W5Hk8j0jVJNXS7QLIXg3GRJz9DnC4vRWwIytWiE 9uEg== X-Gm-Message-State: AOAM533jeolGPUCz7J5VmDVbBgJOTmJpJjWWo9i/YCUXpM6qhSfXiiXF 1l2bSq8Lm7lC1XRIMiY6M3IEDThp X-Google-Smtp-Source: ABdhPJwO4qZQPgqRybdB4Iubsfb2dfLrQqqqinTbGiPavxL3I8kpgq/xWGyIdFc1CtIvZbgnCgfGFnad Sender: "lzye via sendgmr" X-Received: from chrisye.mtv.corp.google.com ([2620:15c:211:2:f693:9fff:fef4:4323]) (user=lzye job=sendgmr) by 2002:a0c:e054:: with SMTP id y20mr5839816qvk.30.1604000838752; Thu, 29 Oct 2020 12:47:18 -0700 (PDT) Date: Thu, 29 Oct 2020 12:47:14 -0700 Message-Id: <20201029194714.1613308-1-lzye@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH] Add devices for HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE From: Chris Ye To: Dmitry Torokhov , Alexandru Ardelean , Mark Brown Cc: linux-kernel@vger.kernel.org, trivial@kernel.org, linux-input@vger.kernel.org, linzhao.ye@gmail.com, Chris Ye Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Kernel 5.4 introduces HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE, devices need to be set explicitly with this flag. Signed-off-by: Chris Ye --- drivers/hid/hid-ids.h | 4 ++++ drivers/hid/hid-quirks.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 74be76e848bf..cf55dca494f3 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -449,6 +449,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 0440e2f6e8a3..36d94e3485e3 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -84,6 +84,10 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28), HID_QUIRK_NOGET }, { 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_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 },