All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Luke D Jones <luke@ljones.dev>, Jiri Kosina <jkosina@suse.cz>,
	Sasha Levin <sashal@kernel.org>,
	linux-input@vger.kernel.org
Subject: [PATCH AUTOSEL 5.11 02/23] HID: asus: Add support for 2021 ASUS N-Key keyboard
Date: Mon, 19 Apr 2021 16:43:21 -0400	[thread overview]
Message-ID: <20210419204343.6134-2-sashal@kernel.org> (raw)
In-Reply-To: <20210419204343.6134-1-sashal@kernel.org>

From: Luke D Jones <luke@ljones.dev>

[ Upstream commit 9a0b44fbfea1932196a4879b44a37dd182e984c5 ]

Some new 2021 version of ASUS gamer laptops are using an updated
N-Key keyboard with the PID of 0x19b6. This version is using the
same init sequence and brightness control as the 0x1866 keyboard.

Signed-off-by: Luke D Jones <luke@ljones.dev>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/hid/hid-asus.c | 3 +++
 drivers/hid/hid-ids.h  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
index 1dfe184ebf5a..2ab22b925941 100644
--- a/drivers/hid/hid-asus.c
+++ b/drivers/hid/hid-asus.c
@@ -1221,6 +1221,9 @@ static const struct hid_device_id asus_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
 	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD),
 	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),
+	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
 		USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),
 	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 570bd0103a86..09d049986516 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -191,6 +191,7 @@
 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837
 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822
 #define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD	0x1866
+#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2	0x19b6
 #define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869
 
 #define USB_VENDOR_ID_ATEN		0x0557
-- 
2.30.2


  reply	other threads:[~2021-04-19 20:43 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-19 20:43 [PATCH AUTOSEL 5.11 01/23] HID: google: add don USB id Sasha Levin
2021-04-19 20:43 ` Sasha Levin [this message]
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 03/23] HID: alps: fix error return code in alps_input_configured() Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 04/23] HID cp2112: fix support for multiple gpiochips Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 05/23] HID: wacom: Assign boolean values to a bool variable Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 06/23] soc: qcom: geni: shield geni_icc_get() for ACPI boot Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 07/23] dmaengine: xilinx: dpdma: Fix descriptor issuing on video group Sasha Levin
2021-04-19 20:43   ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 08/23] dmaengine: xilinx: dpdma: Fix race condition in done IRQ Sasha Levin
2021-04-19 20:43   ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 09/23] ARM: dts: Fix swapped mmc order for omap3 Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 10/23] m68k: fix flatmem memory model setup Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 11/23] net: geneve: check skb is large enough for IPv4/IPv6 header Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 12/23] dmaengine: tegra20: Fix runtime PM imbalance on error Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 13/23] s390/entry: save the caller of psw_idle Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 14/23] arm64: kprobes: Restore local irqflag if kprobes is cancelled Sasha Levin
2021-04-19 20:43   ` Sasha Levin
2021-04-19 20:43   ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 15/23] xen-netback: Check for hotplug-status existence before watching Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 16/23] cavium/liquidio: Fix duplicate argument Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 17/23] i2c: mv64xxx: Fix random system lock caused by runtime PM Sasha Levin
2021-04-20  6:30   ` Marek Behún
2021-04-25 21:41     ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 18/23] kasan: fix hwasan build for gcc Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 19/23] csky: change a Kconfig symbol name to fix e1000 build error Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 20/23] ia64: fix discontig.c section mismatches Sasha Levin
2021-04-19 20:43   ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 21/23] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 22/23] gcov: clang: fix clang-11+ build Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 23/23] 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=20210419204343.6134-2-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=jkosina@suse.cz \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luke@ljones.dev \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.