quirks: add a more generic match for the 5288 Synaptics clickpad

This is a clickpad announcing BTN_RIGHT in different machines, see
issue #674, #689, #629 and MR !701. There are at least 4 machines that
ship with this device that we had to quirk independently, possibly
others so disabling BTN_RIGHT on all of them makes sense.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/quirks/30-vendor-starlabs.quirks b/quirks/30-vendor-starlabs.quirks
index 34f42d4..d59e397 100644 (file)
--- a/quirks/30-vendor-starlabs.quirks
+++ b/quirks/30-vendor-starlabs.quirks
@@ -27,15 +27,3 @@ MatchName=HTIX5288:00 093A:0255 Touchpad
 MatchUdevType=touchpad
 MatchDMIModalias=dmi:*svnStarLabs:pnLite*
 AttrEventCodeDisable=BTN_RIGHT
-
-[StarLite Mk II - coreboot firmware]
-MatchName=STAR0001:00 0911:5288 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnLite*
-AttrEventCodeDisable=BTN_RIGHT
-
-[StarLite Mk II - AMI firmware]
-MatchName=ALPS0001:00 0911:5288 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnStarLabs:pnLite*
-AttrEventCodeDisable=BTN_RIGHT

diff --git a/quirks/30-vendor-synaptics.quirks b/quirks/30-vendor-synaptics.quirks
index 3cdeb45..26f4373 100644 (file)
--- a/quirks/30-vendor-synaptics.quirks
+++ b/quirks/30-vendor-synaptics.quirks
@@ -6,3 +6,14 @@ MatchBus=ps2
 MatchVendor=0x0002
 MatchProduct=0x0007
 ModelSynapticsSerialTouchpad=1
+
+# SYNA3602:00 0911:5288 touchpad, clickpad pretending it has a right button.
+# Integrated into several systems, including
+# Purism Librem 14v1
+# Prestigio Smartbook 141 C2
+# StarLite Mk II
+# Iota IOTA2320
+[Synaptics 0911:5288 Touchpad]
+MatchUdevType=touchpad
+MatchName=* 0911:5288 Touchpad
+AttrEventCodeDisable=BTN_RIGHT

diff --git a/quirks/50-system-prestigio.quirks b/quirks/50-system-prestigio.quirks
deleted file mode 100644 (file)
index 3b3559f..0000000
--- a/quirks/50-system-prestigio.quirks
+++ /dev/null
@@ -1,7 +0,0 @@
-# Clickpad that announces BTN_RIGHT
-# https://gitlab.freedesktop.org/libinput/libinput/-/issues/674
-[Prestigio Smartbook 141 C2 Touchpad]
-MatchName=SYNA3602:00 0911:5288 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnPrestigio:*pnPSB141C02*
-AttrEventCodeDisable=BTN_RIGHT

diff --git a/quirks/50-system-purism.quirks b/quirks/50-system-purism.quirks
deleted file mode 100644 (file)
index fdfad26..0000000
--- a/quirks/50-system-purism.quirks
+++ /dev/null
@@ -1,7 +0,0 @@
-# Clickpad that announces BTN_RIGHT
-# https://gitlab.freedesktop.org/libinput/libinput/-/issues/629
-[Librem 14v1 Touchpad]
-MatchName=HTIX5288:00 0911:5288 Touchpad
-MatchUdevType=touchpad
-MatchDMIModalias=dmi:*svnPurism:*pn[Ll]ibrem*14:*
-AttrEventCodeDisable=BTN_RIGHT