[PATCH synaptics] conf: ship a quirk for Cypress touchpads

[Peter Hutterer]

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 conf/11-x11-synaptics.fdi |  9 +++++++++
 conf/50-synaptics.conf    | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/conf/11-x11-synaptics.fdi b/conf/11-x11-synaptics.fdi
index a898875..44dfce3 100644
--- a/conf/11-x11-synaptics.fdi
+++ b/conf/11-x11-synaptics.fdi
@@ -34,6 +34,15 @@
         <match key="info.product" contains="Apple|bcm5974">
             <merge key="input.x11_options.SoftButtonAreas" type="string">0 0 0 0 0 0 0 0</merge>
         </match>
+
+        <!--The Cypress touchpads provide BTN_RIGHT in firmware, together with
+            clickfinger, and two-finger scrolling. Disable Clickpads, otherwise we
+            get flaky button behaviour.
+            https://bugs.freedesktop.org/show_bug.cgi?id=70819
+            https://bugs.freedesktop.org/show_bug.cgi?id=76341 -->
+        <match key="info.product" contains="CyPS/2 Cypress Trackpad">
+            <merge key="input.x11_options.ClickPad" type="string">off</merge>
+        </match>
     </match>
 
     <match
diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf
index d808e6f..4072fce 100644
--- a/conf/50-synaptics.conf
+++ b/conf/50-synaptics.conf
@@ -46,6 +46,18 @@ Section "InputClass"
         Option "SoftButtonAreas" "0 0 0 0 0 0 0 0"
 EndSection
 
+# The Cypress touchpads provide BTN_RIGHT in firmware, together with
+# clickfinger, and two-finger scrolling. Disable Clickpads, otherwise we
+# get flaky button behaviour.
+# https://bugs.freedesktop.org/show_bug.cgi?id=70819
+# https://bugs.freedesktop.org/show_bug.cgi?id=76341
+Section "InputClass"
+        Identifier "Disable clickpad for CyPS/2 Cypress Trackpad"
+        MatchProduct "CyPS/2 Cypress Trackpad"
+        MatchDriver "synaptics"
+        Option "ClickPad" "off"
+EndSection
+
 # The Lenovo *40 series has no physical button for the TrackPoint and needs
 # the top softbutton area enabled by default.
 # Affected devices and their PNPIDs
-- 
1.8.5.3