159 lines
5.0 KiB
Diff
159 lines
5.0 KiB
Diff
From 08dc8bb7454c13fe0f6d62bfa71d7bc0a68f236c Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Fri, 27 Jun 2014 18:50:33 +0200
|
|
Subject: [PATCH] psmouse: Add support for detecting FocalTech PS/2 touchpads
|
|
|
|
The Asus X450 and X550 laptops use a PS/2 touchpad from a new manufacturer
|
|
called FocalTech:
|
|
|
|
https://bugzilla.kernel.org/show_bug.cgi?id=77391
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1110011
|
|
|
|
The protocol for these devices is not known at this time, but even without
|
|
knowing the protocol they need some special handling. They get upset by some
|
|
of our other PS/2 device probing, and once upset generate random mouse events
|
|
making things unusable even with an external mouse.
|
|
|
|
This patch adds detection of these devices based on their pnp ids, and when
|
|
they are detected, treats them as a bare ps/2 mouse. Doing things this way
|
|
they at least work in their ps/2 mouse emulation mode.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
drivers/input/mouse/Makefile | 2 +-
|
|
drivers/input/mouse/focaltech.c | 44 ++++++++++++++++++++++++++++++++++++++
|
|
drivers/input/mouse/focaltech.h | 21 ++++++++++++++++++
|
|
drivers/input/mouse/psmouse-base.c | 10 +++++++++
|
|
4 files changed, 76 insertions(+), 1 deletion(-)
|
|
create mode 100644 drivers/input/mouse/focaltech.c
|
|
create mode 100644 drivers/input/mouse/focaltech.h
|
|
|
|
diff --git a/drivers/input/mouse/Makefile b/drivers/input/mouse/Makefile
|
|
index c25efdb3f288..dda507f8b3a2 100644
|
|
--- a/drivers/input/mouse/Makefile
|
|
+++ b/drivers/input/mouse/Makefile
|
|
@@ -23,7 +23,7 @@ obj-$(CONFIG_MOUSE_SYNAPTICS_I2C) += synaptics_i2c.o
|
|
obj-$(CONFIG_MOUSE_SYNAPTICS_USB) += synaptics_usb.o
|
|
obj-$(CONFIG_MOUSE_VSXXXAA) += vsxxxaa.o
|
|
|
|
-psmouse-objs := psmouse-base.o synaptics.o
|
|
+psmouse-objs := psmouse-base.o synaptics.o focaltech.o
|
|
|
|
psmouse-$(CONFIG_MOUSE_PS2_ALPS) += alps.o
|
|
psmouse-$(CONFIG_MOUSE_PS2_ELANTECH) += elantech.o
|
|
diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
|
|
new file mode 100644
|
|
index 000000000000..d83a23554d63
|
|
--- /dev/null
|
|
+++ b/drivers/input/mouse/focaltech.c
|
|
@@ -0,0 +1,44 @@
|
|
+/*
|
|
+ * Focaltech TouchPad PS/2 mouse driver
|
|
+ *
|
|
+ * Copyright (c) 2014 Red Hat Inc.
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or modify
|
|
+ * it under the terms of the GNU General Public License as published by
|
|
+ * the Free Software Foundation; either version 2 of the License, or
|
|
+ * (at your option) any later version.
|
|
+ *
|
|
+ * Red Hat authors:
|
|
+ *
|
|
+ * Hans de Goede <hdegoede@redhat.com>
|
|
+ */
|
|
+
|
|
+/*
|
|
+ * The Focaltech PS/2 touchpad protocol is unknown. This drivers deals with
|
|
+ * detection only, to avoid further detection attempts confusing the touchpad
|
|
+ * this way it at least works in PS/2 mouse compatibility mode.
|
|
+ */
|
|
+
|
|
+#include <linux/device.h>
|
|
+#include <linux/libps2.h>
|
|
+#include "psmouse.h"
|
|
+
|
|
+static const char * const focaltech_pnp_ids[] = {
|
|
+ "FLT0101",
|
|
+ "FLT0102",
|
|
+ "FLT0103",
|
|
+ NULL
|
|
+};
|
|
+
|
|
+int focaltech_detect(struct psmouse *psmouse, bool set_properties)
|
|
+{
|
|
+ if (!psmouse_matches_pnp_id(psmouse, focaltech_pnp_ids))
|
|
+ return -ENODEV;
|
|
+
|
|
+ if (set_properties) {
|
|
+ psmouse->vendor = "FocalTech";
|
|
+ psmouse->name = "FocalTech Touchpad in mouse emulation mode";
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
diff --git a/drivers/input/mouse/focaltech.h b/drivers/input/mouse/focaltech.h
|
|
new file mode 100644
|
|
index 000000000000..0d0fc49451fe
|
|
--- /dev/null
|
|
+++ b/drivers/input/mouse/focaltech.h
|
|
@@ -0,0 +1,21 @@
|
|
+/*
|
|
+ * Focaltech TouchPad PS/2 mouse driver
|
|
+ *
|
|
+ * Copyright (c) 2014 Red Hat Inc.
|
|
+ *
|
|
+ * This program is free software; you can redistribute it and/or modify
|
|
+ * it under the terms of the GNU General Public License as published by
|
|
+ * the Free Software Foundation; either version 2 of the License, or
|
|
+ * (at your option) any later version.
|
|
+ *
|
|
+ * Red Hat authors:
|
|
+ *
|
|
+ * Hans de Goede <hdegoede@redhat.com>
|
|
+ */
|
|
+
|
|
+#ifndef _FOCALTECH_H
|
|
+#define _FOCALTECH_H
|
|
+
|
|
+int focaltech_detect(struct psmouse *psmouse, bool set_properties);
|
|
+
|
|
+#endif
|
|
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
|
|
index 02e68c3008a3..2c8c8e2172a2 100644
|
|
--- a/drivers/input/mouse/psmouse-base.c
|
|
+++ b/drivers/input/mouse/psmouse-base.c
|
|
@@ -35,6 +35,7 @@
|
|
#include "elantech.h"
|
|
#include "sentelic.h"
|
|
#include "cypress_ps2.h"
|
|
+#include "focaltech.h"
|
|
|
|
#define DRIVER_DESC "PS/2 mouse driver"
|
|
|
|
@@ -722,6 +723,13 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
|
{
|
|
bool synaptics_hardware = false;
|
|
|
|
+/* Always check for focaltech, this is safe as it uses pnp-id matching */
|
|
+ if (psmouse_do_detect(focaltech_detect, psmouse, set_properties) == 0) {
|
|
+ /* Not supported yet, use bare protocol */
|
|
+ psmouse_max_proto = max_proto = PSMOUSE_PS2;
|
|
+ goto reset_to_defaults;
|
|
+ }
|
|
+
|
|
/*
|
|
* We always check for lifebook because it does not disturb mouse
|
|
* (it only checks DMI information).
|
|
@@ -873,6 +881,8 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
|
}
|
|
}
|
|
|
|
+reset_to_defaults:
|
|
+
|
|
/*
|
|
* Reset to defaults in case the device got confused by extended
|
|
* protocol probes. Note that we follow up with full reset because
|
|
--
|
|
1.9.3
|
|
|