mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Input: add support for Cypress PS/2 Trackpads
This driver, submitted on behalf of Cypress Semiconductor Corporation and additional contributors, provides support for the Cypress PS/2 Trackpad. Original code contributed by Dudley Du (Cypress Semiconductor Corporation), modified by Kamal Mostafa and Kyle Fazzari. BugLink: http://launchpad.net/bugs/978807 Signed-off-by: Dudley Du <dudl@cypress.com> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Kyle Fazzari <git@status.e4ward.com> Signed-off-by: Mario Limonciello <mario_limonciello@dell.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Herton Krzesinski <herton.krzesinski@canonical.com> Reviewed-by: Henrik Rydberg <rydberg@euromail.se> Reviewed-by: Dudley Du <dudl@cypress.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dudley Du
committed by
Dmitry Torokhov
Dmitry Torokhov
parent
80524f083e
commit
0799a924bc
@@ -68,6 +68,16 @@ config MOUSE_PS2_SYNAPTICS
|
||||
|
||||
If unsure, say Y.
|
||||
|
||||
config MOUSE_PS2_CYPRESS
|
||||
bool "Cypress PS/2 mouse protocol extension" if EXPERT
|
||||
default y
|
||||
depends on MOUSE_PS2
|
||||
help
|
||||
Say Y here if you have a Cypress PS/2 Trackpad connected to
|
||||
your system.
|
||||
|
||||
If unsure, say Y.
|
||||
|
||||
config MOUSE_PS2_LIFEBOOK
|
||||
bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EXPERT
|
||||
default y
|
||||
|
||||
@@ -32,3 +32,4 @@ psmouse-$(CONFIG_MOUSE_PS2_LIFEBOOK) += lifebook.o
|
||||
psmouse-$(CONFIG_MOUSE_PS2_SENTELIC) += sentelic.o
|
||||
psmouse-$(CONFIG_MOUSE_PS2_TRACKPOINT) += trackpoint.o
|
||||
psmouse-$(CONFIG_MOUSE_PS2_TOUCHKIT) += touchkit_ps2.o
|
||||
psmouse-$(CONFIG_MOUSE_PS2_CYPRESS) += cypress_ps2.o
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,191 @@
|
||||
#ifndef _CYPRESS_PS2_H
|
||||
#define _CYPRESS_PS2_H
|
||||
|
||||
#include "psmouse.h"
|
||||
|
||||
#define CMD_BITS_MASK 0x03
|
||||
#define COMPOSIT(x, s) (((x) & CMD_BITS_MASK) << (s))
|
||||
|
||||
#define ENCODE_CMD(aa, bb, cc, dd) \
|
||||
(COMPOSIT((aa), 6) | COMPOSIT((bb), 4) | COMPOSIT((cc), 2) | COMPOSIT((dd), 0))
|
||||
#define CYTP_CMD_ABS_NO_PRESSURE_MODE ENCODE_CMD(0, 1, 0, 0)
|
||||
#define CYTP_CMD_ABS_WITH_PRESSURE_MODE ENCODE_CMD(0, 1, 0, 1)
|
||||
#define CYTP_CMD_SMBUS_MODE ENCODE_CMD(0, 1, 1, 0)
|
||||
#define CYTP_CMD_STANDARD_MODE ENCODE_CMD(0, 2, 0, 0) /* not implemented yet. */
|
||||
#define CYTP_CMD_CYPRESS_REL_MODE ENCODE_CMD(1, 1, 1, 1) /* not implemented yet. */
|
||||
#define CYTP_CMD_READ_CYPRESS_ID ENCODE_CMD(0, 0, 0, 0)
|
||||
#define CYTP_CMD_READ_TP_METRICS ENCODE_CMD(0, 0, 0, 1)
|
||||
#define CYTP_CMD_SET_HSCROLL_WIDTH(w) ENCODE_CMD(1, 1, 0, (w))
|
||||
#define CYTP_CMD_SET_HSCROLL_MASK ENCODE_CMD(1, 1, 0, 0)
|
||||
#define CYTP_CMD_SET_VSCROLL_WIDTH(w) ENCODE_CMD(1, 2, 0, (w))
|
||||
#define CYTP_CMD_SET_VSCROLL_MASK ENCODE_CMD(1, 2, 0, 0)
|
||||
#define CYTP_CMD_SET_PALM_GEOMETRY(e) ENCODE_CMD(1, 2, 1, (e))
|
||||
#define CYTP_CMD_PALM_GEMMETRY_MASK ENCODE_CMD(1, 2, 1, 0)
|
||||
#define CYTP_CMD_SET_PALM_SENSITIVITY(s) ENCODE_CMD(1, 2, 2, (s))
|
||||
#define CYTP_CMD_PALM_SENSITIVITY_MASK ENCODE_CMD(1, 2, 2, 0)
|
||||
#define CYTP_CMD_SET_MOUSE_SENSITIVITY(s) ENCODE_CMD(1, 3, ((s) >> 2), (s))
|
||||
#define CYTP_CMD_MOUSE_SENSITIVITY_MASK ENCODE_CMD(1, 3, 0, 0)
|
||||
#define CYTP_CMD_REQUEST_BASELINE_STATUS ENCODE_CMD(2, 0, 0, 1)
|
||||
#define CYTP_CMD_REQUEST_RECALIBRATION ENCODE_CMD(2, 0, 0, 3)
|
||||
|
||||
#define DECODE_CMD_AA(x) (((x) >> 6) & CMD_BITS_MASK)
|
||||
#define DECODE_CMD_BB(x) (((x) >> 4) & CMD_BITS_MASK)
|
||||
#define DECODE_CMD_CC(x) (((x) >> 2) & CMD_BITS_MASK)
|
||||
#define DECODE_CMD_DD(x) ((x) & CMD_BITS_MASK)
|
||||
|
||||
/* Cypress trackpad working mode. */
|
||||
#define CYTP_BIT_ABS_PRESSURE (1 << 3)
|
||||
#define CYTP_BIT_ABS_NO_PRESSURE (1 << 2)
|
||||
#define CYTP_BIT_CYPRESS_REL (1 << 1)
|
||||
#define CYTP_BIT_STANDARD_REL (1 << 0)
|
||||
#define CYTP_BIT_REL_MASK (CYTP_BIT_CYPRESS_REL | CYTP_BIT_STANDARD_REL)
|
||||
#define CYTP_BIT_ABS_MASK (CYTP_BIT_ABS_PRESSURE | CYTP_BIT_ABS_NO_PRESSURE)
|
||||
#define CYTP_BIT_ABS_REL_MASK (CYTP_BIT_ABS_MASK | CYTP_BIT_REL_MASK)
|
||||
|
||||
#define CYTP_BIT_HIGH_RATE (1 << 4)
|
||||
/*
|
||||
* report mode bit is set, firmware working in Remote Mode.
|
||||
* report mode bit is cleared, firmware working in Stream Mode.
|
||||
*/
|
||||
#define CYTP_BIT_REPORT_MODE (1 << 5)
|
||||
|
||||
/* scrolling width values for set HSCROLL and VSCROLL width command. */
|
||||
#define SCROLL_WIDTH_NARROW 1
|
||||
#define SCROLL_WIDTH_NORMAL 2
|
||||
#define SCROLL_WIDTH_WIDE 3
|
||||
|
||||
#define PALM_GEOMETRY_ENABLE 1
|
||||
#define PALM_GEOMETRY_DISABLE 0
|
||||
|
||||
#define TP_METRICS_MASK 0x80
|
||||
#define FW_VERSION_MASX 0x7f
|
||||
#define FW_VER_HIGH_MASK 0x70
|
||||
#define FW_VER_LOW_MASK 0x0f
|
||||
|
||||
/* Times to retry a ps2_command and millisecond delay between tries. */
|
||||
#define CYTP_PS2_CMD_TRIES 3
|
||||
#define CYTP_PS2_CMD_DELAY 500
|
||||
|
||||
/* time out for PS/2 command only in milliseconds. */
|
||||
#define CYTP_CMD_TIMEOUT 200
|
||||
#define CYTP_DATA_TIMEOUT 30
|
||||
|
||||
#define CYTP_EXT_CMD 0xe8
|
||||
#define CYTP_PS2_RETRY 0xfe
|
||||
#define CYTP_PS2_ERROR 0xfc
|
||||
|
||||
#define CYTP_RESP_RETRY 0x01
|
||||
#define CYTP_RESP_ERROR 0xfe
|
||||
|
||||
|
||||
#define CYTP_105001_WIDTH 97 /* Dell XPS 13 */
|
||||
#define CYTP_105001_HIGH 59
|
||||
#define CYTP_DEFAULT_WIDTH (CYTP_105001_WIDTH)
|
||||
#define CYTP_DEFAULT_HIGH (CYTP_105001_HIGH)
|
||||
|
||||
#define CYTP_ABS_MAX_X 1600
|
||||
#define CYTP_ABS_MAX_Y 900
|
||||
#define CYTP_MAX_PRESSURE 255
|
||||
#define CYTP_MIN_PRESSURE 0
|
||||
|
||||
/* header byte bits of relative package. */
|
||||
#define BTN_LEFT_BIT 0x01
|
||||
#define BTN_RIGHT_BIT 0x02
|
||||
#define BTN_MIDDLE_BIT 0x04
|
||||
#define REL_X_SIGN_BIT 0x10
|
||||
#define REL_Y_SIGN_BIT 0x20
|
||||
|
||||
/* header byte bits of absolute package. */
|
||||
#define ABS_VSCROLL_BIT 0x10
|
||||
#define ABS_HSCROLL_BIT 0x20
|
||||
#define ABS_MULTIFINGER_TAP 0x04
|
||||
#define ABS_EDGE_MOTION_MASK 0x80
|
||||
|
||||
#define DFLT_RESP_BITS_VALID 0x88 /* SMBus bit should not be set. */
|
||||
#define DFLT_RESP_SMBUS_BIT 0x80
|
||||
#define DFLT_SMBUS_MODE 0x80
|
||||
#define DFLT_PS2_MODE 0x00
|
||||
#define DFLT_RESP_BIT_MODE 0x40
|
||||
#define DFLT_RESP_REMOTE_MODE 0x40
|
||||
#define DFLT_RESP_STREAM_MODE 0x00
|
||||
#define DFLT_RESP_BIT_REPORTING 0x20
|
||||
#define DFLT_RESP_BIT_SCALING 0x10
|
||||
|
||||
#define TP_METRICS_BIT_PALM 0x80
|
||||
#define TP_METRICS_BIT_STUBBORN 0x40
|
||||
#define TP_METRICS_BIT_2F_JITTER 0x30
|
||||
#define TP_METRICS_BIT_1F_JITTER 0x0c
|
||||
#define TP_METRICS_BIT_APA 0x02
|
||||
#define TP_METRICS_BIT_MTG 0x01
|
||||
#define TP_METRICS_BIT_ABS_PKT_FORMAT_SET 0xf0
|
||||
#define TP_METRICS_BIT_2F_SPIKE 0x0c
|
||||
#define TP_METRICS_BIT_1F_SPIKE 0x03
|
||||
|
||||
/* bits of first byte response of E9h-Status Request command. */
|
||||
#define RESP_BTN_RIGHT_BIT 0x01
|
||||
#define RESP_BTN_MIDDLE_BIT 0x02
|
||||
#define RESP_BTN_LEFT_BIT 0x04
|
||||
#define RESP_SCALING_BIT 0x10
|
||||
#define RESP_ENABLE_BIT 0x20
|
||||
#define RESP_REMOTE_BIT 0x40
|
||||
#define RESP_SMBUS_BIT 0x80
|
||||
|
||||
#define CYTP_MAX_MT_SLOTS 2
|
||||
|
||||
struct cytp_contact {
|
||||
int x;
|
||||
int y;
|
||||
int z; /* also named as touch pressure. */
|
||||
};
|
||||
|
||||
/* The structure of Cypress Trackpad event data. */
|
||||
struct cytp_report_data {
|
||||
int contact_cnt;
|
||||
struct cytp_contact contacts[CYTP_MAX_MT_SLOTS];
|
||||
unsigned int left:1;
|
||||
unsigned int right:1;
|
||||
unsigned int middle:1;
|
||||
unsigned int tap:1; /* multi-finger tap detected. */
|
||||
};
|
||||
|
||||
/* The structure of Cypress Trackpad device private data. */
|
||||
struct cytp_data {
|
||||
int fw_version;
|
||||
|
||||
int pkt_size;
|
||||
int mode;
|
||||
|
||||
int tp_min_pressure;
|
||||
int tp_max_pressure;
|
||||
int tp_width; /* X direction physical size in mm. */
|
||||
int tp_high; /* Y direction physical size in mm. */
|
||||
int tp_max_abs_x; /* Max X absolute units that can be reported. */
|
||||
int tp_max_abs_y; /* Max Y absolute units that can be reported. */
|
||||
|
||||
int tp_res_x; /* X resolution in units/mm. */
|
||||
int tp_res_y; /* Y resolution in units/mm. */
|
||||
|
||||
int tp_metrics_supported;
|
||||
};
|
||||
|
||||
|
||||
#ifdef CONFIG_MOUSE_PS2_CYPRESS
|
||||
int cypress_detect(struct psmouse *psmouse, bool set_properties);
|
||||
int cypress_init(struct psmouse *psmouse);
|
||||
bool cypress_supported(void);
|
||||
#else
|
||||
inline int cypress_detect(struct psmouse *psmouse, bool set_properties)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
inline int cypress_init(struct psmouse *psmouse)
|
||||
{
|
||||
return -ENOSYS;
|
||||
}
|
||||
inline bool cypress_supported(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_MOUSE_PS2_CYPRESS */
|
||||
|
||||
#endif /* _CYPRESS_PS2_H */
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "touchkit_ps2.h"
|
||||
#include "elantech.h"
|
||||
#include "sentelic.h"
|
||||
#include "cypress_ps2.h"
|
||||
|
||||
#define DRIVER_DESC "PS/2 mouse driver"
|
||||
|
||||
@@ -758,6 +759,28 @@ static int psmouse_extensions(struct psmouse *psmouse,
|
||||
synaptics_reset(psmouse);
|
||||
}
|
||||
|
||||
/*
|
||||
* Try Cypress Trackpad.
|
||||
* Must try it before Finger Sensing Pad because Finger Sensing Pad probe
|
||||
* upsets some modules of Cypress Trackpads.
|
||||
*/
|
||||
if (max_proto > PSMOUSE_IMEX &&
|
||||
cypress_detect(psmouse, set_properties) == 0) {
|
||||
if (cypress_supported()) {
|
||||
if (cypress_init(psmouse) == 0)
|
||||
return PSMOUSE_CYPRESS;
|
||||
|
||||
/*
|
||||
* Finger Sensing Pad probe upsets some modules of
|
||||
* Cypress Trackpad, must avoid Finger Sensing Pad
|
||||
* probe if Cypress Trackpad device detected.
|
||||
*/
|
||||
return PSMOUSE_PS2;
|
||||
}
|
||||
|
||||
max_proto = PSMOUSE_IMEX;
|
||||
}
|
||||
|
||||
/*
|
||||
* Try ALPS TouchPad
|
||||
*/
|
||||
@@ -896,6 +919,15 @@ static const struct psmouse_protocol psmouse_protocols[] = {
|
||||
.alias = "thinkps",
|
||||
.detect = thinking_detect,
|
||||
},
|
||||
#ifdef CONFIG_MOUSE_PS2_CYPRESS
|
||||
{
|
||||
.type = PSMOUSE_CYPRESS,
|
||||
.name = "CyPS/2",
|
||||
.alias = "cypress",
|
||||
.detect = cypress_detect,
|
||||
.init = cypress_init,
|
||||
},
|
||||
#endif
|
||||
{
|
||||
.type = PSMOUSE_GENPS,
|
||||
.name = "GenPS/2",
|
||||
|
||||
@@ -95,6 +95,7 @@ enum psmouse_type {
|
||||
PSMOUSE_ELANTECH,
|
||||
PSMOUSE_FSP,
|
||||
PSMOUSE_SYNAPTICS_RELATIVE,
|
||||
PSMOUSE_CYPRESS,
|
||||
PSMOUSE_AUTO /* This one should always be last */
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user