From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: stable@vger.kernel.org
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
patches@lists.linux.dev, "Mark Waddoups" <mwaddoups@gmail.com>,
"José Expósito" <jose.exposito89@gmail.com>,
"Jiri Kosina" <jkosina@suse.cz>,
"Sasha Levin" <sashal@kernel.org>
Subject: [PATCH 6.1 18/28] HID: uclogic: Add support for XP-PEN Deco 01 V2
Date: Fri, 3 Feb 2023 11:13:06 +0100 [thread overview]
Message-ID: <20230203101010.747653988@linuxfoundation.org> (raw)
In-Reply-To: <20230203101009.946745030@linuxfoundation.org>
From: José Expósito <jose.exposito89@gmail.com>
[ Upstream commit febb2c0d7c69c0396aa32d5ab425a4163473961a ]
The XP-PEN Deco 01 V2 is a UGEE v2 device with a frame with 8 buttons.
Its pen has 2 buttons, supports tilt and pressure.
Add its ID in order to support the device.
Link: https://gitlab.freedesktop.org/libinput/libinput/-/issues/839
Tested-by: Mark Waddoups <mwaddoups@gmail.com>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-uclogic-core.c | 2 ++
drivers/hid/hid-uclogic-params.c | 2 ++
3 files changed, 5 insertions(+)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index c3735848ed5d..0f8c11842a3a 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -1294,6 +1294,7 @@
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G540 0x0075
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640 0x0094
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01 0x0042
+#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2 0x0905
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L 0x0935
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_S 0x0909
#define USB_DEVICE_ID_UGEE_XPPEN_TABLET_STAR06 0x0078
diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c
index 7fa6fe04f1b2..cfbbc39807a6 100644
--- a/drivers/hid/hid-uclogic-core.c
+++ b/drivers/hid/hid-uclogic-core.c
@@ -525,6 +525,8 @@ static const struct hid_device_id uclogic_devices[] = {
USB_DEVICE_ID_UGEE_XPPEN_TABLET_G640) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
+ USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L) },
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE,
diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index cd1233d7e253..3c5eea3df328 100644
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -1655,6 +1655,8 @@ int uclogic_params_init(struct uclogic_params *params,
break;
case VID_PID(USB_VENDOR_ID_UGEE,
USB_DEVICE_ID_UGEE_PARBLO_A610_PRO):
+ case VID_PID(USB_VENDOR_ID_UGEE,
+ USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO01_V2):
case VID_PID(USB_VENDOR_ID_UGEE,
USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L):
case VID_PID(USB_VENDOR_ID_UGEE,
--
2.39.0
next prev parent reply other threads:[~2023-02-03 10:22 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 10:12 [PATCH 6.1 00/28] 6.1.10-rc1 review Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 01/28] ARM: dts: imx: Fix pca9547 i2c-mux node name Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 02/28] ARM: dts: vf610: Fix pca9548 i2c-mux node names Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 03/28] arm64: dts: freescale: Fix pca954x " Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 04/28] arm64: dts: imx8mq-thor96: fix no-mmc property for SDHCI Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 05/28] firmware: arm_scmi: Clear stale xfer->hdr.status Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 06/28] bpf: Skip task with pid=1 in send_signal_common() Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 07/28] erofs/zmap.c: Fix incorrect offset calculation Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 08/28] mac80211: Fix MLO address translation for multiple bss case Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 09/28] arm64: dts: msm8994-angler: fix the memory map Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 10/28] ARM: omap1: fix building gpio15xx Greg Kroah-Hartman
2023-02-03 10:12 ` [PATCH 6.1 11/28] kselftest: Fix error message for unconfigured LLVM builds Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 12/28] erofs: clean up parsing of fscache related options Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 13/28] blk-cgroup: fix missing pd_online_fn() while activating policy Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 14/28] LoongArch: Get frame info in unwind_start() when regs is not available Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 15/28] ACPI: video: Add backlight=native DMI quirk for Acer Aspire 4810T Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 16/28] block: fix hctx checks for batch allocation Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 17/28] s390: workaround invalid gcc-11 out of bounds read warning Greg Kroah-Hartman
2023-02-03 10:13 ` Greg Kroah-Hartman [this message]
2023-02-03 10:13 ` [PATCH 6.1 19/28] HID: playstation: sanity check DualSense calibration data Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 20/28] dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 21/28] gpiolib: acpi: Allow ignoring wake capability on pins that arent in _AEI Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 22/28] cifs: fix return of uninitialized rc in dfs_cache_update_tgthint() Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 23/28] nvme-apple: only reset the controller when RTKit is running Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 24/28] gpiolib: acpi: Add a ignore wakeup quirk for Clevo NL5xRU Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 25/28] gpiolib-acpi: Dont set GPIOs for wakeup in S3 mode Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 26/28] net: fix NULL pointer in skb_segment_list Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 27/28] rust: print: avoid evaluating arguments in `pr_*` macros in `unsafe` blocks Greg Kroah-Hartman
2023-02-03 10:13 ` [PATCH 6.1 28/28] net: mctp: purge receive queues on sk destruction Greg Kroah-Hartman
2023-02-03 13:58 ` [PATCH 6.1 00/28] 6.1.10-rc1 review ogasawara takeshi
2023-02-03 18:02 ` Justin Forbes
2023-02-03 20:16 ` Florian Fainelli
2023-02-03 22:34 ` Ron Economos
2023-02-04 0:49 ` Shuah Khan
2023-02-04 1:51 ` Guenter Roeck
2023-02-04 3:28 ` Bagas Sanjaya
2023-02-04 7:25 ` Naresh Kamboju
2023-02-05 19:51 ` Nathan Chancellor
2023-02-06 14:12 ` Naresh Kamboju
2023-02-04 7:27 ` Fenil Jain
2023-02-04 23:45 ` Rudi Heitbaum
2023-02-06 8:57 ` Jon Hunter
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=20230203101010.747653988@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=jkosina@suse.cz \
--cc=jose.exposito89@gmail.com \
--cc=mwaddoups@gmail.com \
--cc=patches@lists.linux.dev \
--cc=sashal@kernel.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 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.