Commit 75af9e56 authored by Dave Turvene's avatar Dave Turvene Committed by Dmitry Torokhov
Browse files

Input: ALPS - add "Dolphin V1" touchpad support 



These touchpads use a different protocol; they have been seen on Dell
N5110, Dell 17R SE, and others.

The official ALPS driver identifies them by looking for an exact match
on the E7 report: 73 03 50.  Dolphin V1 returns an EC report of
73 01 xx (02 and 0d have been seen); Dolphin V2 returns an EC report of
73 02 xx (02 has been seen).

Dolphin V2 probably needs a different initialization sequence and/or
report parser, so it is left for a future commit.

Signed-off-by: default avatarDave Turvene <dturvene@dahetral.com>
Signed-off-by: default avatarKevin Cernekee <cernekee@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent d18e53fc

drivers/input/mouse/alps.c

+65 −2
Original line number Diff line number Diff line
@@ -490,6 +490,29 @@ static void alps_decode_rushmore(struct alps_fields *f, unsigned char *p) 
	f->y_map |= (p[5] & 0x20) << 6;

}



static void alps_decode_dolphin(struct alps_fields *f, unsigned char *p)

{

	f->first_mp = !!(p[0] & 0x02);

	f->is_mp = !!(p[0] & 0x20);



	f->fingers = ((p[0] & 0x6) >> 1 |

		     (p[0] & 0x10) >> 2);

	f->x_map = ((p[2] & 0x60) >> 5) |

		   ((p[4] & 0x7f) << 2) |

		   ((p[5] & 0x7f) << 9) |

		   ((p[3] & 0x07) << 16) |

		   ((p[3] & 0x70) << 15) |

		   ((p[0] & 0x01) << 22);

	f->y_map = (p[1] & 0x7f) |

		   ((p[2] & 0x1f) << 7);



	f->x = ((p[1] & 0x7f) | ((p[4] & 0x0f) << 7));

	f->y = ((p[2] & 0x7f) | ((p[4] & 0xf0) << 3));

	f->z = (p[0] & 4) ? 0 : p[5] & 0x7f;



	alps_decode_buttons_v3(f, p);

}



static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

{

	struct alps_data *priv = psmouse->private;
@@ -874,7 +897,8 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse) 
	}



	/* Bytes 2 - pktsize should have 0 in the highest bit */

	if (psmouse->pktcnt >= 2 && psmouse->pktcnt <= psmouse->pktsize &&

	if (priv->proto_version != ALPS_PROTO_V5 &&

	    psmouse->pktcnt >= 2 && psmouse->pktcnt <= psmouse->pktsize &&

	    (psmouse->packet[psmouse->pktcnt - 1] & 0x80)) {

		psmouse_dbg(psmouse, "refusing packet[%i] = %x\n",

			    psmouse->pktcnt - 1,
@@ -1003,7 +1027,8 @@ static int alps_enter_command_mode(struct psmouse *psmouse) 
		return -1;

	}



	if (param[0] != 0x88 || (param[1] != 0x07 && param[1] != 0x08)) {

	if ((param[0] != 0x88 || (param[1] != 0x07 && param[1] != 0x08)) &&

	    param[0] != 0x73) {

		psmouse_dbg(psmouse,

			    "unknown response while entering command mode\n");

		return -1;
@@ -1495,6 +1520,23 @@ error: 
	return -1;

}



static int alps_hw_init_dolphin_v1(struct psmouse *psmouse)

{

	struct ps2dev *ps2dev = &psmouse->ps2dev;

	unsigned char param[2];



	/* This is dolphin "v1" as empirically defined by florin9doi */

	param[0] = 0x64;

	param[1] = 0x28;



	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSTREAM) ||

	    ps2_command(ps2dev, &param[0], PSMOUSE_CMD_SETRATE) ||

	    ps2_command(ps2dev, &param[1], PSMOUSE_CMD_SETRATE))

		return -1;



	return 0;

}



static void alps_set_defaults(struct alps_data *priv)

{

	priv->byte0 = 0x8f;
@@ -1528,6 +1570,21 @@ static void alps_set_defaults(struct alps_data *priv) 
		priv->nibble_commands = alps_v4_nibble_commands;

		priv->addr_command = PSMOUSE_CMD_DISABLE;

		break;

	case ALPS_PROTO_V5:

		priv->hw_init = alps_hw_init_dolphin_v1;

		priv->process_packet = alps_process_packet_v3;

		priv->decode_fields = alps_decode_dolphin;

		priv->set_abs_params = alps_set_abs_params_mt;

		priv->nibble_commands = alps_v3_nibble_commands;

		priv->addr_command = PSMOUSE_CMD_RESET_WRAP;

		priv->byte0 = 0xc8;

		priv->mask0 = 0xc8;

		priv->flags = 0;

		priv->x_max = 1360;

		priv->y_max = 660;

		priv->x_bits = 23;

		priv->y_bits = 12;

		break;

	}

}
@@ -1587,6 +1644,12 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) 
		return -EIO;



	if (alps_match_table(psmouse, priv, e7, ec) == 0) {

		return 0;

	} else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&

		   ec[0] == 0x73 && ec[1] == 0x01) {

		priv->proto_version = ALPS_PROTO_V5;

		alps_set_defaults(priv);



		return 0;

	} else if (ec[0] == 0x88 && ec[1] == 0x08) {

		priv->proto_version = ALPS_PROTO_V3;

drivers/input/mouse/alps.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#define ALPS_PROTO_V2	2

#define ALPS_PROTO_V3	3

#define ALPS_PROTO_V4	4

#define ALPS_PROTO_V5	5



/**

 * struct alps_model_info - touchpad ID table

CRA Git | Maintained and supported by SUSTech CRA and CCSE