diff mbox series

[5.11,22/41] HID: google: add don USB id

Message ID	20210426072820.439020481@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Shou-Chieh Hsu <shouchieh@chromium.org>, Jiri Kosina <jkosina@suse.cz>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.11 22/41] HID: google: add don USB id Date: Mon, 26 Apr 2021 09:30:09 +0200 Message-Id: <20210426072820.439020481@linuxfoundation.org> In-Reply-To: <20210426072819.666570770@linuxfoundation.org> References: <20210426072819.666570770@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.11,02/41] ovl: fix reference counting in ovl_mmap error path [5.11,03/41] coda: fix reference counting in coda_file_mmap error path [5.11,05/41] drm/amdgpu: reserve fence slot to update page table [5.11,07/41] gpio: omap: Save and restore sysconfig [5.11,09/41] vdpa/mlx5: Set err = -ENOMEM in case dma_map_sg_attrs fails [5.11,10/41] pinctrl: lewisburg: Update number of pins in community [5.11,12/41] pinctrl: core: Show pin numbers for the controllers with base = 0 [5.11,16/41] bpf: Tighten speculative pointer arithmetic mask [5.11,19/41] perf/x86/kvm: Fix Broadwell Xeon stepping in isolation_ucodes[] [5.11,20/41] perf auxtrace: Fix potential NULL pointer dereference [5.11,21/41] perf map: Fix error return code in maps__clone() [5.11,22/41] HID: google: add don USB id [5.11,23/41] HID: asus: Add support for 2021 ASUS N-Key keyboard [5.11,26/41] HID: wacom: Assign boolean values to a bool variable [5.11,27/41] soc: qcom: geni: shield geni_icc_get() for ACPI boot [5.11,28/41] dmaengine: xilinx: dpdma: Fix descriptor issuing on video group [5.11,29/41] dmaengine: xilinx: dpdma: Fix race condition in done IRQ [5.11,30/41] ARM: dts: Fix swapped mmc order for omap3 [5.11,33/41] dmaengine: tegra20: Fix runtime PM imbalance on error [5.11,34/41] s390/entry: save the caller of psw_idle [5.11,36/41] xen-netback: Check for hotplug-status existence before watching [5.11,40/41] ia64: tools: remove duplicate definition of ia64_mf() on ia64

Commit Message

Greg Kroah-Hartman April 26, 2021, 7:30 a.m. UTC

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 mbox series

Patch

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 b60279aaed43..570bd0103a86 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -488,6 +488,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