From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
Jiri Kosina <jkosina@suse.cz>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.19 25/47] HID: multitouch: Add pointstick support for ALPS Touchpad
Date: Thu, 18 Jul 2019 12:01:39 +0900 [thread overview]
Message-ID: <20190718030050.859172951@linuxfoundation.org> (raw)
In-Reply-To: <20190718030045.780672747@linuxfoundation.org>
[ Upstream commit 0a95fc733da375de0688d0f1fd3a2869a1c1d499 ]
There's a new ALPS touchpad/pointstick combo device that requires
MT_CLS_WIN_8_DUAL to make its pointsitck work as a mouse.
The device can be found on HP ZBook 17 G5.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.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-multitouch.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 97b4ecab7c12..50b3c0d89c9c 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -82,6 +82,7 @@
#define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP 0x1220
#define HID_DEVICE_ID_ALPS_U1 0x1215
#define HID_DEVICE_ID_ALPS_T4_BTNLESS 0x120C
+#define HID_DEVICE_ID_ALPS_1222 0x1222
#define USB_VENDOR_ID_AMI 0x046b
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 184e49036e1d..f9167d0e095c 100644
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1788,6 +1788,10 @@ static const struct hid_device_id mt_devices[] = {
HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
USB_VENDOR_ID_ALPS_JP,
HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP) },
+ { .driver_data = MT_CLS_WIN_8_DUAL,
+ HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
+ USB_VENDOR_ID_ALPS_JP,
+ HID_DEVICE_ID_ALPS_1222) },
/* Lenovo X1 TAB Gen 2 */
{ .driver_data = MT_CLS_WIN_8_DUAL,
--
2.20.1
next prev parent reply other threads:[~2019-07-18 3:23 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-18 3:01 [PATCH 4.19 00/47] 4.19.60-stable review Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 01/47] Revert "e1000e: fix cyclic resets at link up with active tx" Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 02/47] e1000e: start network tx queue only when link is up Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 03/47] Input: synaptics - enable SMBUS on T480 thinkpad trackpad Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 04/47] nilfs2: do not use unexported cpu_to_le32()/le32_to_cpu() in uapi header Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 05/47] drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 06/47] firmware: improve LSM/IMA security behaviour Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 07/47] irqchip/gic-v3-its: Fix command queue pointer comparison bug Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 08/47] clk: ti: clkctrl: Fix returning uninitialized data Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 09/47] efi/bgrt: Drop BGRT status field reserved bits check Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 10/47] perf/core: Fix perf_sample_regs_user() mm check Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 11/47] ARM: dts: gemini Fix up DNS-313 compatible string Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 12/47] ARM: omap2: remove incorrect __init annotation Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 13/47] afs: Fix uninitialised spinlock afs_volume::cb_break_lock Greg Kroah-Hartman
2019-07-19 22:33 ` Pavel Machek
2019-07-18 3:01 ` [PATCH 4.19 14/47] x86/apic: Fix integer overflow on 10 bit left shift of cpu_khz Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 15/47] be2net: fix link failure after ethtool offline test Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 16/47] ppp: mppe: Add softdep to arc4 Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 17/47] sis900: fix TX completion Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 18/47] ARM: dts: imx6ul: fix PWM[1-4] interrupts Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 19/47] pinctrl: mcp23s08: Fix add_data and irqchip_add_nested call order Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 20/47] dm table: dont copy from a NULL pointer in realloc_argv() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 21/47] dm verity: use message limit for data block corruption message Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 22/47] x86/boot/64: Fix crash if kernel image crosses page table boundary Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 23/47] x86/boot/64: Add missing fixup_pointer() for next_early_pgt access Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 24/47] HID: chicony: add another quirk for PixArt mouse Greg Kroah-Hartman
2019-07-18 3:01 ` Greg Kroah-Hartman [this message]
2019-07-18 3:01 ` [PATCH 4.19 26/47] pinctrl: mediatek: Ignore interrupts that are wake only during resume Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 27/47] cpu/hotplug: Fix out-of-bounds read when setting fail state Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 28/47] pinctrl: mediatek: Update cur_mask in mask/mask ops Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 29/47] linux/kernel.h: fix overflow for DIV_ROUND_UP_ULL Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 30/47] genirq: Delay deactivation in free_irq() Greg Kroah-Hartman
2019-07-19 19:58 ` Pavel Machek
2019-07-20 10:09 ` Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 31/47] genirq: Fix misleading synchronize_irq() documentation Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 32/47] genirq: Add optional hardware synchronization for shutdown Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 33/47] x86/ioapic: Implement irq_get_irqchip_state() callback Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 34/47] x86/irq: Handle spurious interrupt after shutdown gracefully Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 35/47] x86/irq: Seperate unused system vectors from spurious entry again Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 36/47] ARC: hide unused function unw_hdr_alloc Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 37/47] s390: fix stfle zero padding Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 38/47] s390/qdio: (re-)initialize tiqdio list entries Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 39/47] s390/qdio: dont touch the dsci in tiqdio_add_input_queues() Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 40/47] crypto: talitos - move struct talitos_edesc into talitos.h Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 41/47] crypto: talitos - fix hash on SEC1 Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 42/47] crypto/NX: Set receive window credits to max number of CRBs in RxFIFO Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 43/47] regmap-irq: do not write mask register if mask_base is zero Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 44/47] drm/udl: introduce a macro to convert dev to udl Greg Kroah-Hartman
2019-07-18 3:01 ` [PATCH 4.19 45/47] drm/udl: Replace drm_dev_unref with drm_dev_put Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.19 46/47] drm/udl: move to embedding drm device inside udl device Greg Kroah-Hartman
2019-07-18 3:02 ` [PATCH 4.19 47/47] x86/entry/32: Fix ENDPROC of common_spurious Greg Kroah-Hartman
2019-07-18 8:13 ` [PATCH 4.19 00/47] 4.19.60-stable review kernelci.org bot
2019-07-18 9:20 ` Jon Hunter
2019-07-18 9:47 ` Naresh Kamboju
2019-07-18 19:48 ` Guenter Roeck
2019-07-18 20:57 ` Kelsey Skunberg
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=20190718030050.859172951@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=jkosina@suse.cz \
--cc=kai.heng.feng@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--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 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).