From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Shou-Chieh Hsu <shouchieh@chromium.org>,
Jiri Kosina <jkosina@suse.cz>, Sasha Levin <sashal@kernel.org>,
linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 01/21] HID: google: add don USB id
Date: Mon, 19 Apr 2021 16:43:59 -0400 [thread overview]
Message-ID: <20210419204420.6375-1-sashal@kernel.org> (raw)
From: Shou-Chieh Hsu <shouchieh@chromium.org>
[ Upstream commit 36b87cf302a4f13f8b4344bcf98f67405a145e2f ]
Add 1 additional hammer-like device.
Signed-off-by: Shou-Chieh Hsu <shouchieh@chromium.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/hid/hid-google-hammer.c | 2 ++
drivers/hid/hid-ids.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index 85a054f1ce38..2a176f77b32e 100644
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -526,6 +526,8 @@ static void hammer_remove(struct hid_device *hdev)
}
static const struct hid_device_id hammer_devices[] = {
+ { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
+ USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_DON) },
{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_HAMMER) },
{ HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 06813f297dcc..b93ce0d475e0 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -486,6 +486,7 @@
#define USB_DEVICE_ID_GOOGLE_MASTERBALL 0x503c
#define USB_DEVICE_ID_GOOGLE_MAGNEMITE 0x503d
#define USB_DEVICE_ID_GOOGLE_MOONBALL 0x5044
+#define USB_DEVICE_ID_GOOGLE_DON 0x5050
#define USB_VENDOR_ID_GOTOP 0x08f2
#define USB_DEVICE_ID_SUPER_Q2 0x007f
--
2.30.2
next reply other threads:[~2021-04-19 20:44 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 20:43 Sasha Levin [this message]
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 02/21] HID: alps: fix error return code in alps_input_configured() Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 03/21] HID cp2112: fix support for multiple gpiochips Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 04/21] HID: wacom: Assign boolean values to a bool variable Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 05/21] soc: qcom: geni: shield geni_icc_get() for ACPI boot Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 06/21] dmaengine: xilinx: dpdma: Fix descriptor issuing on video group Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 07/21] dmaengine: xilinx: dpdma: Fix race condition in done IRQ Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 08/21] ARM: dts: Fix swapped mmc order for omap3 Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 09/21] net: geneve: check skb is large enough for IPv4/IPv6 header Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 10/21] dmaengine: tegra20: Fix runtime PM imbalance on error Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 11/21] s390/entry: save the caller of psw_idle Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 12/21] arm64: kprobes: Restore local irqflag if kprobes is cancelled Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 13/21] xen-netback: Check for hotplug-status existence before watching Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 14/21] cavium/liquidio: Fix duplicate argument Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 15/21] i2c: mv64xxx: Fix random system lock caused by runtime PM Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 16/21] kasan: fix hwasan build for gcc Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 17/21] csky: change a Kconfig symbol name to fix e1000 build error Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 18/21] ia64: fix discontig.c section mismatches Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 19/21] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 20/21] gcov: clang: fix clang-11+ build Sasha Levin
2021-04-19 20:44 ` [PATCH AUTOSEL 5.10 21/21] readdir: make sure to verify directory entry for legacy interfaces too Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210419204420.6375-1-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shouchieh@chromium.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).