From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 23 Oct 2020 01:01:57 +0000 (+1000)
Subject: quirks: switch the models with missing buttonpad to use the new attr
X-Git-Tag: 1.16.901~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b925a0878b0b51fe30016546b9e48a7613dccd4d;p=platform%2Fupstream%2Flibinput.git

quirks: switch the models with missing buttonpad to use the new attr

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

diff --git a/quirks/50-system-hp.quirks b/quirks/50-system-hp.quirks
index 0109991e..b25d39f9 100644
--- a/quirks/50-system-hp.quirks
+++ b/quirks/50-system-hp.quirks
@@ -19,10 +19,12 @@ MatchName=*SynPS/2 Synaptics TouchPad
 MatchDMIModalias=dmi:*svnHewlett-Packard:*pnHPPaviliondm4NotebookPC*
 ModelHPPavilionDM4Touchpad=1
 
+# Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
+# https://bugs.freedesktop.org/show_bug.cgi?id=97147
 [HP Stream 11]
 MatchName=SYN1EDE:00 06CB:7442
 MatchDMIModalias=dmi:*svnHewlett-Packard:pnHPStreamNotebookPC11*
-ModelHPStream11Touchpad=1
+AttrInputPropEnable=INPUT_PROP_BUTTONPAD
 
 # The HP stream x360's embedded-controller filters out events form its builtin
 # keyboard when in tablet-mode itself; and it has a capacitive home-button
diff --git a/quirks/50-system-lenovo.quirks b/quirks/50-system-lenovo.quirks
index 19a3b9e5..6c299cbf 100644
--- a/quirks/50-system-lenovo.quirks
+++ b/quirks/50-system-lenovo.quirks
@@ -31,25 +31,31 @@ MatchName=*TPPS/2 IBM TrackPoint
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT480:*
 AttrTrackpointMultiplier=0.4
 
+# Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
+# https://gitlab.freedesktop.org/libinput/libinput/issues/177
 [Lenovo T480s Touchpad]
 MatchName=Elan Touchpad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT480s*
-ModelLenovoT480sTouchpad=1
+AttrInputPropEnable=INPUT_PROP_BUTTONPAD
 
+# Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
+# https://gitlab.freedesktop.org/libinput/libinput/issues/177
 [Lenovo T490s Touchpad]
 MatchName=Elan Touchpad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT490s*
-ModelLenovoT490sTouchpad=1
+AttrInputPropEnable=INPUT_PROP_BUTTONPAD
 
 [Lenovo T490s Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadT490s:*
 AttrTrackpointMultiplier=0.4
 
+# Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
+# https://gitlab.freedesktop.org/libinput/libinput/issues/234
 [Lenovo L380 Touchpad]
 MatchName=Elan Touchpad
 MatchDMIModalias=dmi:*svnLENOVO:*:pvrThinkPadL380*
-ModelLenovoL380Touchpad=1
+AttrInputPropEnable=INPUT_PROP_BUTTONPAD
 
 [Lenovo X200 Trackpoint]
 MatchName=*TPPS/2 IBM TrackPoint
diff --git a/src/evdev.c b/src/evdev.c
index 08484300..bd1f8345 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2058,21 +2058,6 @@ evdev_pre_configure_model_quirks(struct evdev_device *device)
 	size_t nprops = 0;
 	char *prop;
 
-	/* Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
-	 * fdo bug 97147. Remove when RMI4 is commonplace */
-	if (evdev_device_has_model_quirk(device, QUIRK_MODEL_HP_STREAM11_TOUCHPAD))
-		libevdev_enable_property(device->evdev,
-					 INPUT_PROP_BUTTONPAD);
-
-	/* Touchpad is a clickpad but INPUT_PROP_BUTTONPAD is not set, see
-	 * https://gitlab.freedesktop.org/libinput/libinput/issues/177 and
-	 * https://gitlab.freedesktop.org/libinput/libinput/issues/234 */
-	if (evdev_device_has_model_quirk(device, QUIRK_MODEL_LENOVO_T480S_TOUCHPAD) ||
-	    evdev_device_has_model_quirk(device, QUIRK_MODEL_LENOVO_T490S_TOUCHPAD) ||
-	    evdev_device_has_model_quirk(device, QUIRK_MODEL_LENOVO_L380_TOUCHPAD))
-		libevdev_enable_property(device->evdev,
-					 INPUT_PROP_BUTTONPAD);
-
 	/* Touchpad claims to have 4 slots but only ever sends 2
 	 * https://bugs.freedesktop.org/show_bug.cgi?id=98100 */
 	if (evdev_device_has_model_quirk(device, QUIRK_MODEL_HP_ZBOOK_STUDIO_G3))
diff --git a/src/quirks.c b/src/quirks.c
index ded80617..fb49c29a 100644
--- a/src/quirks.c
+++ b/src/quirks.c
@@ -248,11 +248,8 @@ quirk_get_name(enum quirk q)
 	case QUIRK_MODEL_HP_STREAM11_TOUCHPAD:		return "ModelHPStream11Touchpad";
 	case QUIRK_MODEL_HP_ZBOOK_STUDIO_G3:		return "ModelHPZBookStudioG3";
 	case QUIRK_MODEL_INVERT_HORIZONTAL_SCROLLING:	return "ModelInvertHorizontalScrolling";
-	case QUIRK_MODEL_LENOVO_L380_TOUCHPAD:		return "ModelLenovoL380Touchpad";
 	case QUIRK_MODEL_LENOVO_SCROLLPOINT:		return "ModelLenovoScrollPoint";
 	case QUIRK_MODEL_LENOVO_T450_TOUCHPAD:		return "ModelLenovoT450Touchpad";
-	case QUIRK_MODEL_LENOVO_T480S_TOUCHPAD:		return "ModelLenovoT480sTouchpad";
-	case QUIRK_MODEL_LENOVO_T490S_TOUCHPAD:		return "ModelLenovoT490sTouchpad";
 	case QUIRK_MODEL_LENOVO_X1GEN6_TOUCHPAD:	return "ModelLenovoX1Gen6Touchpad";
 	case QUIRK_MODEL_LENOVO_X230:			return "ModelLenovoX230";
 	case QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD:	return "ModelSynapticsSerialTouchpad";
diff --git a/src/quirks.h b/src/quirks.h
index 46d224da..9a11df67 100644
--- a/src/quirks.h
+++ b/src/quirks.h
@@ -72,11 +72,8 @@ enum quirk {
 	QUIRK_MODEL_HP_STREAM11_TOUCHPAD,
 	QUIRK_MODEL_HP_ZBOOK_STUDIO_G3,
 	QUIRK_MODEL_INVERT_HORIZONTAL_SCROLLING,
-	QUIRK_MODEL_LENOVO_L380_TOUCHPAD,
 	QUIRK_MODEL_LENOVO_SCROLLPOINT,
 	QUIRK_MODEL_LENOVO_T450_TOUCHPAD,
-	QUIRK_MODEL_LENOVO_T480S_TOUCHPAD,
-	QUIRK_MODEL_LENOVO_T490S_TOUCHPAD,
 	QUIRK_MODEL_LENOVO_X1GEN6_TOUCHPAD,
 	QUIRK_MODEL_LENOVO_X230,
 	QUIRK_MODEL_SYNAPTICS_SERIAL_TOUCHPAD,