Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-21 09:11:55 +0100
committerTakashi Iwai <tiwai@suse.de>2019-02-21 09:12:00 +0100
commitc74480a08d07c2156443313c8c01769b570e2dce (patch)
treee5d02a9519b4065a85c91850abad3da70a904910
parent7fb8540b6c62ff3ac5cb46244414d3afae3de30b (diff)
Input: elantech - enable 3rd button support on Fujitsu CELSIUS
H780 (bsc#1051510).
-rw-r--r--patches.drivers/Input-elantech-enable-3rd-button-support-on-Fujitsu-.patch56
-rw-r--r--series.conf1
2 files changed, 57 insertions, 0 deletions
diff --git a/patches.drivers/Input-elantech-enable-3rd-button-support-on-Fujitsu-.patch b/patches.drivers/Input-elantech-enable-3rd-button-support-on-Fujitsu-.patch
new file mode 100644
index 0000000000..0653e25a0f
--- /dev/null
+++ b/patches.drivers/Input-elantech-enable-3rd-button-support-on-Fujitsu-.patch
@@ -0,0 +1,56 @@
+From e8b22d0a329f0fb5c7ef95406872d268f01ee3b1 Mon Sep 17 00:00:00 2001
+From: Matti Kurkela <Matti.Kurkela@iki.fi>
+Date: Thu, 7 Feb 2019 23:49:23 -0800
+Subject: [PATCH] Input: elantech - enable 3rd button support on Fujitsu CELSIUS H780
+Git-commit: e8b22d0a329f0fb5c7ef95406872d268f01ee3b1
+Patch-mainline: v5.0-rc7
+References: bsc#1051510
+
+Like Fujitsu CELSIUS H760, the H780 also has a three-button Elantech
+touchpad, but the driver needs to be told so to enable the middle touchpad
+button.
+
+The elantech_dmi_force_crc_enabled quirk was not necessary with the H780.
+
+Also document the fw_version and caps values detected for both H760 and
+H780 models.
+
+Signed-off-by: Matti Kurkela <Matti.Kurkela@iki.fi>
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/input/mouse/elantech.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
+index 9fe075c137dc..a7f8b1614559 100644
+--- a/drivers/input/mouse/elantech.c
++++ b/drivers/input/mouse/elantech.c
+@@ -1119,6 +1119,8 @@ static int elantech_get_resolution_v4(struct psmouse *psmouse,
+ * Asus UX31 0x361f00 20, 15, 0e clickpad
+ * Asus UX32VD 0x361f02 00, 15, 0e clickpad
+ * Avatar AVIU-145A2 0x361f00 ? clickpad
++ * Fujitsu CELSIUS H760 0x570f02 40, 14, 0c 3 hw buttons (**)
++ * Fujitsu CELSIUS H780 0x5d0f02 41, 16, 0d 3 hw buttons (**)
+ * Fujitsu LIFEBOOK E544 0x470f00 d0, 12, 09 2 hw buttons
+ * Fujitsu LIFEBOOK E546 0x470f00 50, 12, 09 2 hw buttons
+ * Fujitsu LIFEBOOK E547 0x470f00 50, 12, 09 2 hw buttons
+@@ -1171,6 +1173,13 @@ static const struct dmi_system_id elantech_dmi_has_middle_button[] = {
+ DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H760"),
+ },
+ },
++ {
++ /* Fujitsu H780 also has a middle button */
++ .matches = {
++ DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
++ DMI_MATCH(DMI_PRODUCT_NAME, "CELSIUS H780"),
++ },
++ },
+ #endif
+ { }
+ };
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b382264c0a..305febbbd2 100644
--- a/series.conf
+++ b/series.conf
@@ -20391,6 +20391,7 @@
patches.drm/0006-drm-i915-opregion-rvda-is-relative-from-opregion-bas.patch
patches.drivers/floppy-check_events-callback-should-not-return-a-neg.patch
patches.drivers/Input-bma150-register-input-device-after-setting-pri.patch
+ patches.drivers/Input-elantech-enable-3rd-button-support-on-Fujitsu-.patch
patches.drivers/i2c-cadence-Fix-the-hold-bit-setting.patch
patches.drivers/i2c-bcm2835-Clear-current-buffer-pointers-and-counts.patch
patches.fixes/mac80211-Restore-vif-beacon-interval-if-start-ap-fai.patch