diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c

index e229fa3..7b99fc7 100644

--- a/drivers/input/mouse/alps.c

+++ b/drivers/input/mouse/alps.c

@@ -27,14 +27,11 @@

 /*

  * Definitions for ALPS version 3 and 4 command mode protocol

  */

-#define ALPS_V3_X_MAX	2000

-#define ALPS_V3_Y_MAX	1400

-

-#define ALPS_BITMAP_X_BITS	15

-#define ALPS_BITMAP_Y_BITS	11

-

 #define ALPS_CMD_NIBBLE_10	0x01f2

+#define ALPS_REG_BASE_RUSHMORE	0xc2c0

+#define ALPS_REG_BASE_PINNACLE	0x0000

+

 static const struct alps_nibble_commands alps_v3_nibble_commands[] = {

 	{ PSMOUSE_CMD_SETPOLL,		0x00 }, /* 0 */

 	{ PSMOUSE_CMD_RESET_DIS,	0x00 }, /* 1 */

@@ -109,11 +106,14 @@ static const struct alps_model_info alps_model_data[] = {

 	{ { 0x73, 0x02, 0x50 }, 0x00, ALPS_PROTO_V2, 0xcf, 0xcf, ALPS_FOUR_BUTTONS },		/* Dell Vostro 1400 */

 	{ { 0x52, 0x01, 0x14 }, 0x00, ALPS_PROTO_V2, 0xff, 0xff,

 		ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },				/* Toshiba Tecra A11-11L */

-	{ { 0x73, 0x02, 0x64 },	0x9b, ALPS_PROTO_V3, 0x8f, 0x8f, ALPS_DUALPOINT },

-	{ { 0x73, 0x02, 0x64 },	0x9d, ALPS_PROTO_V3, 0x8f, 0x8f, ALPS_DUALPOINT },

 	{ { 0x73, 0x02, 0x64 },	0x8a, ALPS_PROTO_V4, 0x8f, 0x8f, 0 },

 };

+static void alps_set_abs_params_st(struct alps_data *priv,

+				   struct input_dev *dev1);

+static void alps_set_abs_params_mt(struct alps_data *priv,

+				   struct input_dev *dev1);

+

 /*

  * XXX - this entry is suspicious. First byte has zero lower nibble,

  * which is what a normal mouse would report. Also, the value 0x0e

@@ -122,10 +122,10 @@ static const struct alps_model_info alps_model_data[] = {

 /* Packet formats are described in Documentation/input/alps.txt */

-static bool alps_is_valid_first_byte(const struct alps_model_info *model,

+static bool alps_is_valid_first_byte(struct alps_data *priv,

 				     unsigned char data)

 {

-	return (data & model->mask0) == model->byte0;

+	return (data & priv->mask0) == priv->byte0;

 }

 static void alps_report_buttons(struct psmouse *psmouse,

@@ -158,14 +158,13 @@ static void alps_report_buttons(struct psmouse *psmouse,

 static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

 	unsigned char *packet = psmouse->packet;

 	struct input_dev *dev = psmouse->dev;

 	struct input_dev *dev2 = priv->dev2;

 	int x, y, z, ges, fin, left, right, middle;

 	int back = 0, forward = 0;

-	if (model->proto_version == ALPS_PROTO_V1) {

+	if (priv->proto_version == ALPS_PROTO_V1) {

 		left = packet[2] & 0x10;

 		right = packet[2] & 0x08;

 		middle = 0;

@@ -181,12 +180,12 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 		z = packet[5];

 	}

-	if (model->flags & ALPS_FW_BK_1) {

+	if (priv->flags & ALPS_FW_BK_1) {

 		back = packet[0] & 0x10;

 		forward = packet[2] & 4;

 	}

-	if (model->flags & ALPS_FW_BK_2) {

+	if (priv->flags & ALPS_FW_BK_2) {

 		back = packet[3] & 4;

 		forward = packet[2] & 4;

 		if ((middle = forward && back))

@@ -196,7 +195,7 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 	ges = packet[2] & 1;

 	fin = packet[2] & 2;

-	if ((model->flags & ALPS_DUALPOINT) && z == 127) {

+	if ((priv->flags & ALPS_DUALPOINT) && z == 127) {

 		input_report_rel(dev2, REL_X,  (x > 383 ? (x - 768) : x));

 		input_report_rel(dev2, REL_Y, -(y > 255 ? (y - 512) : y));

@@ -239,15 +238,15 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)

 	input_report_abs(dev, ABS_PRESSURE, z);

 	input_report_key(dev, BTN_TOOL_FINGER, z > 0);

-	if (model->flags & ALPS_WHEEL)

+	if (priv->flags & ALPS_WHEEL)

 		input_report_rel(dev, REL_WHEEL, ((packet[2] << 1) & 0x08) - ((packet[0] >> 4) & 0x07));

-	if (model->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {

+	if (priv->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {

 		input_report_key(dev, BTN_FORWARD, forward);

 		input_report_key(dev, BTN_BACK, back);

 	}

-	if (model->flags & ALPS_FOUR_BUTTONS) {

+	if (priv->flags & ALPS_FOUR_BUTTONS) {

 		input_report_key(dev, BTN_0, packet[2] & 4);

 		input_report_key(dev, BTN_1, packet[0] & 0x10);

 		input_report_key(dev, BTN_2, packet[3] & 4);

@@ -267,7 +266,8 @@ static void alps_process_packet_v1_v2(struct psmouse *psmouse)

  * These points are returned in x1, y1, x2, and y2 when the return value

  * is greater than 0.

  */

-static int alps_process_bitmap(unsigned int x_map, unsigned int y_map,

+static int alps_process_bitmap(struct alps_data *priv,

+			       unsigned int x_map, unsigned int y_map,

 			       int *x1, int *y1, int *x2, int *y2)

 {

 	struct alps_bitmap_point {

@@ -309,7 +309,7 @@ static int alps_process_bitmap(unsigned int x_map, unsigned int y_map,

 	 * y bitmap is reversed for what we need (lower positions are in

 	 * higher bits), so we process from the top end.

 	 */

-	y_map = y_map << (sizeof(y_map) * BITS_PER_BYTE - ALPS_BITMAP_Y_BITS);

+	y_map = y_map << (sizeof(y_map) * BITS_PER_BYTE - priv->y_bits);

 	prev_bit = 0;

 	point = &y_low;

 	for (i = 0; y_map != 0; i++, y_map <<= 1) {

@@ -355,16 +355,18 @@ static int alps_process_bitmap(unsigned int x_map, unsigned int y_map,

 		}

 	}

-	*x1 = (ALPS_V3_X_MAX * (2 * x_low.start_bit + x_low.num_bits - 1)) /

-	      (2 * (ALPS_BITMAP_X_BITS - 1));

-	*y1 = (ALPS_V3_Y_MAX * (2 * y_low.start_bit + y_low.num_bits - 1)) /

-	      (2 * (ALPS_BITMAP_Y_BITS - 1));

+	*x1 = (priv->x_max * (2 * x_low.start_bit + x_low.num_bits - 1)) /

+	      (2 * (priv->x_bits - 1));

+	*y1 = (priv->y_max * (2 * y_low.start_bit + y_low.num_bits - 1)) /

+	      (2 * (priv->y_bits - 1));

 	if (fingers > 1) {

-		*x2 = (ALPS_V3_X_MAX * (2 * x_high.start_bit + x_high.num_bits - 1)) /

-		      (2 * (ALPS_BITMAP_X_BITS - 1));

-		*y2 = (ALPS_V3_Y_MAX * (2 * y_high.start_bit + y_high.num_bits - 1)) /

-		      (2 * (ALPS_BITMAP_Y_BITS - 1));

+		*x2 = (priv->x_max *

+		       (2 * x_high.start_bit + x_high.num_bits - 1)) /

+		      (2 * (priv->x_bits - 1));

+		*y2 = (priv->y_max *

+		       (2 * y_high.start_bit + y_high.num_bits - 1)) /

+		      (2 * (priv->y_bits - 1));

 	}

 	return fingers;

@@ -448,17 +450,57 @@ static void alps_process_trackstick_packet_v3(struct psmouse *psmouse)

 	return;

 }

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

+{

+	f->left = !!(p[3] & 0x01);

+	f->right = !!(p[3] & 0x02);

+	f->middle = !!(p[3] & 0x04);

+

+	f->ts_left = !!(p[3] & 0x10);

+	f->ts_right = !!(p[3] & 0x20);

+	f->ts_middle = !!(p[3] & 0x40);

+}

+

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

+{

+	f->first_mp = !!(p[4] & 0x40);

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

+

+	f->fingers = (p[5] & 0x3) + 1;

+	f->x_map = ((p[4] & 0x7e) << 8) |

+		   ((p[1] & 0x7f) << 2) |

+		   ((p[0] & 0x30) >> 4);

+	f->y_map = ((p[3] & 0x70) << 4) |

+		   ((p[2] & 0x7f) << 1) |

+		   (p[4] & 0x01);

+

+	f->x = ((p[1] & 0x7f) << 4) | ((p[4] & 0x30) >> 2) |

+	       ((p[0] & 0x30) >> 4);

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

+	f->z = p[5] & 0x7f;

+

+	alps_decode_buttons_v3(f, p);

+}

+

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

+{

+	alps_decode_pinnacle(f, p);

+

+	f->x_map |= (p[5] & 0x10) << 11;

+	f->y_map |= (p[5] & 0x20) << 6;

+}

+

 static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

 	unsigned char *packet = psmouse->packet;

 	struct input_dev *dev = psmouse->dev;

 	struct input_dev *dev2 = priv->dev2;

-	int x, y, z;

-	int left, right, middle;

 	int x1 = 0, y1 = 0, x2 = 0, y2 = 0;

 	int fingers = 0, bmap_fingers;

-	unsigned int x_bitmap, y_bitmap;

+	struct alps_fields f;

+

+	priv->decode_fields(&f, packet);

 	/*

 	 * There's no single feature of touchpad position and bitmap packets

@@ -473,16 +515,10 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

 		 * packet. Check for this, and when it happens process the

 		 * position packet as usual.

 		 */

-		if (packet[0] & 0x40) {

-			fingers = (packet[5] & 0x3) + 1;

-			x_bitmap = ((packet[4] & 0x7e) << 8) |

-				   ((packet[1] & 0x7f) << 2) |

-				   ((packet[0] & 0x30) >> 4);

-			y_bitmap = ((packet[3] & 0x70) << 4) |

-				   ((packet[2] & 0x7f) << 1) |

-				   (packet[4] & 0x01);

-

-			bmap_fingers = alps_process_bitmap(x_bitmap, y_bitmap,

+		if (f.is_mp) {

+			fingers = f.fingers;

+			bmap_fingers = alps_process_bitmap(priv,

+							   f.x_map, f.y_map,

 							   &x1, &y1, &x2, &y2;;

 			/*

@@ -493,7 +529,7 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

 				fingers = bmap_fingers;

 			/* Now process position packet */

-			packet = priv->multi_data;

+			priv->decode_fields(&f, priv->multi_data);

 		} else {

 			priv->multi_packet = 0;

 		}

@@ -507,10 +543,10 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

 	 * out misidentified bitmap packets, we reject anything with this

 	 * bit set.

 	 */

-	if (packet[0] & 0x40)

+	if (f.is_mp)

 		return;

-	if (!priv->multi_packet && (packet[4] & 0x40)) {

+	if (!priv->multi_packet && f.first_mp) {

 		priv->multi_packet = 1;

 		memcpy(priv->multi_data, packet, sizeof(priv->multi_data));

 		return;

@@ -518,22 +554,13 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

 	priv->multi_packet = 0;

-	left = packet[3] & 0x01;

-	right = packet[3] & 0x02;

-	middle = packet[3] & 0x04;

-

-	x = ((packet[1] & 0x7f) << 4) | ((packet[4] & 0x30) >> 2) |

-	    ((packet[0] & 0x30) >> 4);

-	y = ((packet[2] & 0x7f) << 4) | (packet[4] & 0x0f);

-	z = packet[5] & 0x7f;

-

 	/*

 	 * Sometimes the hardware sends a single packet with z = 0

 	 * in the middle of a stream. Real releases generate packets

 	 * with x, y, and z all zero, so these seem to be flukes.

 	 * Ignore them.

 	 */

-	if (x && y && !z)

+	if (f.x && f.y && !f.z)

 		return;

 	/*

@@ -541,12 +568,12 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

 	 * to rely on ST data.

 	 */

 	if (!fingers) {

-		x1 = x;

-		y1 = y;

-		fingers = z > 0 ? 1 : 0;

+		x1 = f.x;

+		y1 = f.y;

+		fingers = f.z > 0 ? 1 : 0;

 	}

-	if (z >= 64)

+	if (f.z >= 64)

 		input_report_key(dev, BTN_TOUCH, 1);

 	else

 		input_report_key(dev, BTN_TOUCH, 0);

@@ -555,26 +582,22 @@ static void alps_process_touchpad_packet_v3(struct psmouse *psmouse)

 	input_mt_report_finger_count(dev, fingers);

-	input_report_key(dev, BTN_LEFT, left);

-	input_report_key(dev, BTN_RIGHT, right);

-	input_report_key(dev, BTN_MIDDLE, middle);

+	input_report_key(dev, BTN_LEFT, f.left);

+	input_report_key(dev, BTN_RIGHT, f.right);

+	input_report_key(dev, BTN_MIDDLE, f.middle);

-	if (z > 0) {

-		input_report_abs(dev, ABS_X, x);

-		input_report_abs(dev, ABS_Y, y);

+	if (f.z > 0) {

+		input_report_abs(dev, ABS_X, f.x);

+		input_report_abs(dev, ABS_Y, f.y);

 	}

-	input_report_abs(dev, ABS_PRESSURE, z);

+	input_report_abs(dev, ABS_PRESSURE, f.z);

 	input_sync(dev);

 	if (!(priv->quirks & ALPS_QUIRK_TRACKSTICK_BUTTONS)) {

-		left = packet[3] & 0x10;

-		right = packet[3] & 0x20;

-		middle = packet[3] & 0x40;

-

-		input_report_key(dev2, BTN_LEFT, left);

-		input_report_key(dev2, BTN_RIGHT, right);

-		input_report_key(dev2, BTN_MIDDLE, middle);

+		input_report_key(dev2, BTN_LEFT, f.ts_left);

+		input_report_key(dev2, BTN_RIGHT, f.ts_right);

+		input_report_key(dev2, BTN_MIDDLE, f.ts_middle);

 		input_sync(dev2);

 	}

 }

@@ -639,7 +662,7 @@ static void alps_process_packet_v4(struct psmouse *psmouse)

 			   ((priv->multi_data[3] & 0x1f) << 5) |

 			    (priv->multi_data[1] & 0x1f);

-		fingers = alps_process_bitmap(x_bitmap, y_bitmap,

+		fingers = alps_process_bitmap(priv, x_bitmap, y_bitmap,

 					      &x1, &y1, &x2, &y2;;

 		/* Store MT data.*/

@@ -696,25 +719,6 @@ static void alps_process_packet_v4(struct psmouse *psmouse)

 	input_sync(dev);

 }

-static void alps_process_packet(struct psmouse *psmouse)

-{

-	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

-

-	switch (model->proto_version) {

-	case ALPS_PROTO_V1:

-	case ALPS_PROTO_V2:

-		alps_process_packet_v1_v2(psmouse);

-		break;

-	case ALPS_PROTO_V3:

-		alps_process_packet_v3(psmouse);

-		break;

-	case ALPS_PROTO_V4:

-		alps_process_packet_v4(psmouse);

-		break;

-	}

-}

-

 static void alps_report_bare_ps2_packet(struct psmouse *psmouse,

 					unsigned char packet[],

 					bool report_buttons)

@@ -765,14 +769,14 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)

 		if (((psmouse->packet[3] |

 		      psmouse->packet[4] |

 		      psmouse->packet[5]) & 0x80) ||

-		    (!alps_is_valid_first_byte(priv->i, psmouse->packet[6]))) {

+		    (!alps_is_valid_first_byte(priv, psmouse->packet[6]))) {

 			psmouse_dbg(psmouse,

 				    "refusing packet %4ph (suspected interleaved ps/2)\n",

 				    psmouse->packet + 3);

 			return PSMOUSE_BAD_DATA;

 		}

-		alps_process_packet(psmouse);

+		priv->process_packet(psmouse);

 		/* Continue with the next packet */

 		psmouse->packet[0] = psmouse->packet[6];

@@ -816,6 +820,7 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)

 static void alps_flush_packet(unsigned long data)

 {

 	struct psmouse *psmouse = (struct psmouse *)data;

+	struct alps_data *priv = psmouse->private;

 	serio_pause_rx(psmouse->ps2dev.serio);

@@ -833,7 +838,7 @@ static void alps_flush_packet(unsigned long data)

 				    "refusing packet %3ph (suspected interleaved ps/2)\n",

 				    psmouse->packet + 3);

 		} else {

-			alps_process_packet(psmouse);

+			priv->process_packet(psmouse);

 		}

 		psmouse->pktcnt = 0;

 	}

@@ -844,7 +849,6 @@ static void alps_flush_packet(unsigned long data)

 static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

 	if ((psmouse->packet[0] & 0xc8) == 0x08) { /* PS/2 packet */

 		if (psmouse->pktcnt == 3) {

@@ -857,15 +861,15 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)

 	/* Check for PS/2 packet stuffed in the middle of ALPS packet. */

-	if ((model->flags & ALPS_PS2_INTERLEAVED) &&

+	if ((priv->flags & ALPS_PS2_INTERLEAVED) &&

 	    psmouse->pktcnt >= 4 && (psmouse->packet[3] & 0x0f) == 0x0f) {

 		return alps_handle_interleaved_ps2(psmouse);

 	}

-	if (!alps_is_valid_first_byte(model, psmouse->packet[0])) {

+	if (!alps_is_valid_first_byte(priv, psmouse->packet[0])) {

 		psmouse_dbg(psmouse,

 			    "refusing packet[0] = %x (mask0 = %x, byte0 = %x)\n",

-			    psmouse->packet[0], model->mask0, model->byte0);

+			    psmouse->packet[0], priv->mask0, priv->byte0);

 		return PSMOUSE_BAD_DATA;

 	}

@@ -879,7 +883,7 @@ static psmouse_ret_t alps_process_byte(struct psmouse *psmouse)

 	}

 	if (psmouse->pktcnt == psmouse->pktsize) {

-		alps_process_packet(psmouse);

+		priv->process_packet(psmouse);

 		return PSMOUSE_FULL_PACKET;

 	}

@@ -967,24 +971,42 @@ static int alps_command_mode_write_reg(struct psmouse *psmouse, int addr,

 	return __alps_command_mode_write_reg(psmouse, value);

 }

+static int alps_rpt_cmd(struct psmouse *psmouse, int init_command,

+			int repeated_command, unsigned char *param)

+{

+	struct ps2dev *ps2dev = &psmouse->ps2dev;

+

+	param[0] = 0;

+	if (init_command && ps2_command(ps2dev, param, init_command))

+		return -EIO;

+

+	if (ps2_command(ps2dev,  NULL, repeated_command) ||

+	    ps2_command(ps2dev,  NULL, repeated_command) ||

+	    ps2_command(ps2dev,  NULL, repeated_command))

+		return -EIO;

+

+	param[0] = param[1] = param[2] = 0xff;

+	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+		return -EIO;

+

+	psmouse_dbg(psmouse, "%2.2X report: %2.2x %2.2x %2.2x\n",

+		    repeated_command, param[0], param[1], param[2]);

+	return 0;

+}

+

 static int alps_enter_command_mode(struct psmouse *psmouse,

 				   unsigned char *resp)

 {

 	unsigned char param[4];

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

-	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_RESET_WRAP) ||

-	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {

+	if (alps_rpt_cmd(psmouse, 0, PSMOUSE_CMD_RESET_WRAP, param)) {

 		psmouse_err(psmouse, "failed to enter command mode\n");

 		return -1;

 	}

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

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

 		psmouse_dbg(psmouse,

-			    "unknown response while entering command mode: %2.2x %2.2x %2.2x\n",

-			    param[0], param[1], param[2]);

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

 		return -1;

 	}

@@ -1001,99 +1023,6 @@ static inline int alps_exit_command_mode(struct psmouse *psmouse)

 	return 0;

 }

-static const struct alps_model_info *alps_get_model(struct psmouse *psmouse, int *version)

-{

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

-	static const unsigned char rates[] = { 0, 10, 20, 40, 60, 80, 100, 200 };

-	unsigned char param[4];

-	const struct alps_model_info *model = NULL;

-	int i;

-

-	/*

-	 * First try "E6 report".

-	 * ALPS should return 0,0,10 or 0,0,100 if no buttons are pressed.

-	 * The bits 0-2 of the first byte will be 1s if some buttons are

-	 * pressed.

-	 */

-	param[0] = 0;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE11))

-		return NULL;

-

-	param[0] = param[1] = param[2] = 0xff;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

-		return NULL;

-

-	psmouse_dbg(psmouse, "E6 report: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

-	if ((param[0] & 0xf8) != 0 || param[1] != 0 ||

-	    (param[2] != 10 && param[2] != 100))

-		return NULL;

-

-	/*

-	 * Now try "E7 report". Allowed responses are in

-	 * alps_model_data[].signature

-	 */

-	param[0] = 0;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21) ||

-	    ps2_command(ps2dev,  NULL, PSMOUSE_CMD_SETSCALE21))

-		return NULL;

-

-	param[0] = param[1] = param[2] = 0xff;

-	if (ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

-		return NULL;

-

-	psmouse_dbg(psmouse, "E7 report: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

-	if (version) {

-		for (i = 0; i < ARRAY_SIZE(rates) && param[2] != rates[i]; i++)

-			/* empty */;

-		*version = (param[0] << 8) | (param[1] << 4) | i;

-	}

-

-	for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {

-		if (!memcmp(param, alps_model_data[i].signature,

-			    sizeof(alps_model_data[i].signature))) {

-			model = alps_model_data + i;

-			break;

-		}

-	}

-

-	if (model && model->proto_version > ALPS_PROTO_V2) {

-		/*

-		 * Need to check command mode response to identify

-		 * model

-		 */

-		model = NULL;

-		if (alps_enter_command_mode(psmouse, param)) {

-			psmouse_warn(psmouse,

-				     "touchpad failed to enter command mode\n");

-		} else {

-			for (i = 0; i < ARRAY_SIZE(alps_model_data); i++) {

-				if (alps_model_data[i].proto_version > ALPS_PROTO_V2 &&

-				    alps_model_data[i].command_mode_resp == param[0]) {

-					model = alps_model_data + i;

-					break;

-				}

-			}

-			alps_exit_command_mode(psmouse);

-

-			if (!model)

-				psmouse_dbg(psmouse,

-					    "Unknown command mode response %2.2x\n",

-					    param[0]);

-		}

-	}

-

-	return model;

-}

-

 /*

  * For DualPoint devices select the device that should respond to

  * subsequent commands. It looks like glidepad is behind stickpointer,

@@ -1137,18 +1066,10 @@ static int alps_absolute_mode_v1_v2(struct psmouse *psmouse)

 static int alps_get_status(struct psmouse *psmouse, char *param)

 {

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

-

 	/* Get status: 0xF5 0xF5 0xF5 0xE9 */

-	if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) ||

-	    ps2_command(ps2dev, NULL, PSMOUSE_CMD_DISABLE) ||

-	    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO))

+	if (alps_rpt_cmd(psmouse, 0, PSMOUSE_CMD_DISABLE, param))

 		return -1;

-	psmouse_dbg(psmouse, "Status: %2.2x %2.2x %2.2x",

-		    param[0], param[1], param[2]);

-

 	return 0;

 }

@@ -1190,16 +1111,16 @@ static int alps_poll(struct psmouse *psmouse)

 	unsigned char buf[sizeof(psmouse->packet)];

 	bool poll_failed;

-	if (priv->i->flags & ALPS_PASS)

+	if (priv->flags & ALPS_PASS)

 		alps_passthrough_mode_v2(psmouse, true);

 	poll_failed = ps2_command(&psmouse->ps2dev, buf,

 				  PSMOUSE_CMD_POLL | (psmouse->pktsize << 8)) < 0;

-	if (priv->i->flags & ALPS_PASS)

+	if (priv->flags & ALPS_PASS)

 		alps_passthrough_mode_v2(psmouse, false);

-	if (poll_failed || (buf[0] & priv->i->mask0) != priv->i->byte0)

+	if (poll_failed || (buf[0] & priv->mask0) != priv->byte0)

 		return -1;

 	if ((psmouse->badbyte & 0xc8) == 0x08) {

@@ -1217,9 +1138,8 @@ static int alps_poll(struct psmouse *psmouse)

 static int alps_hw_init_v1_v2(struct psmouse *psmouse)

 {

 	struct alps_data *priv = psmouse->private;

-	const struct alps_model_info *model = priv->i;

-	if ((model->flags & ALPS_PASS) &&

+	if ((priv->flags & ALPS_PASS) &&

 	    alps_passthrough_mode_v2(psmouse, true)) {

 		return -1;

 	}

@@ -1234,7 +1154,7 @@ static int alps_hw_init_v1_v2(struct psmouse *psmouse)

 		return -1;

 	}

-	if ((model->flags & ALPS_PASS) &&

+	if ((priv->flags & ALPS_PASS) &&

 	    alps_passthrough_mode_v2(psmouse, false)) {

 		return -1;

 	}

@@ -1249,26 +1169,31 @@ static int alps_hw_init_v1_v2(struct psmouse *psmouse)

 }

 /*

- * Enable or disable passthrough mode to the trackstick. Must be in

- * command mode when calling this function.

+ * Enable or disable passthrough mode to the trackstick.

  */

-static int alps_passthrough_mode_v3(struct psmouse *psmouse, bool enable)

+static int alps_passthrough_mode_v3(struct psmouse *psmouse,

+				    int reg_base, bool enable)

 {

-	int reg_val;

+	int reg_val, ret = -1;

-	reg_val = alps_command_mode_read_reg(psmouse, 0x0008);

-	if (reg_val == -1)

+	if (alps_enter_command_mode(psmouse, NULL))

 		return -1;

+	reg_val = alps_command_mode_read_reg(psmouse, reg_base + 0x0008);

+	if (reg_val == -1)

+		goto error;

+

 	if (enable)

 		reg_val |= 0x01;

 	else

 		reg_val &= ~0x01;

-	if (__alps_command_mode_write_reg(psmouse, reg_val))

-		return -1;

+	ret = __alps_command_mode_write_reg(psmouse, reg_val);

-	return 0;

+error:

+	if (alps_exit_command_mode(psmouse))

+		ret = -1;

+	return ret;

 }

 /* Must be in command mode when calling this function */

@@ -1287,73 +1212,102 @@ static int alps_absolute_mode_v3(struct psmouse *psmouse)

 	return 0;

 }

-static int alps_hw_init_v3(struct psmouse *psmouse)

+static int alps_probe_trackstick_v3(struct psmouse *psmouse, int reg_base)

 {

-	struct alps_data *priv = psmouse->private;

-	struct ps2dev *ps2dev = &psmouse->ps2dev;

-	int reg_val;

-	unsigned char param[4];

-

-	priv->nibble_commands = alps_v3_nibble_commands;

-	priv->addr_command = PSMOUSE_CMD_RESET_WRAP;

+	int ret = -EIO, reg_val;

 	if (alps_enter_command_mode(psmouse, NULL))

 		goto error;

-	/* Check for trackstick */

-	reg_val = alps_command_mode_read_reg(psmouse, 0x0008);

+	reg_val = alps_command_mode_read_reg(psmouse, reg_base + 0x08);

 	if (reg_val == -1)

 		goto error;

-	if (reg_val & 0x80) {

-		if (alps_passthrough_mode_v3(psmouse, true))

-			goto error;

-		if (alps_exit_command_mode(psmouse))

-			goto error;

+

+	/* bit 7: trackstick is present */

+	ret = reg_val & 0x80 ? 0 : -ENODEV;

+

+error:

+	alps_exit_command_mode(psmouse);

+	return ret;

+}

+

+static int alps_setup_trackstick_v3(struct psmouse *psmouse, int reg_base)

+{

+	struct ps2dev *ps2dev = &psmouse->ps2dev;

+	int ret = 0;

+	unsigned char param[4];

+

+	if (alps_passthrough_mode_v3(psmouse, reg_base, true))

+		return -EIO;

+

+	/*

+	 * E7 report for the trackstick

+	 *

+	 * There have been reports of failures to seem to trace back

+	 * to the above trackstick check failing. When these occur

+	 * this E7 report fails, so when that happens we continue

+	 * with the assumption that there isn't a trackstick after

+	 * all.

+	 */

+	if (alps_rpt_cmd(psmouse, 0, PSMOUSE_CMD_SETSCALE21, param)) {

+		psmouse_warn(psmouse, "trackstick E7 report failed\n");

+		ret = -ENODEV;

+	} else {

+		psmouse_dbg(psmouse,

+			    "trackstick E7 report: %2.2x %2.2x %2.2x\n",

+			    param[0], param[1], param[2]);

 		/*

-		 * E7 report for the trackstick

-		 *

-		 * There have been reports of failures to seem to trace back

-		 * to the above trackstick check failing. When these occur

-		 * this E7 report fails, so when that happens we continue

-		 * with the assumption that there isn't a trackstick after

-		 * all.

+		 * Not sure what this does, but it is absolutely

+		 * essential. Without it, the touchpad does not

+		 * work at all and the trackstick just emits normal

+		 * PS/2 packets.

 		 */

-		param[0] = 0x64;

-		if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||

-		    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||

-		    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE21) ||

-		    ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO)) {

-			psmouse_warn(psmouse, "trackstick E7 report failed\n");

-		} else {

-			psmouse_dbg(psmouse,

-				    "trackstick E7 report: %2.2x %2.2x %2.2x\n",

-				    param[0], param[1], param[2]);

-

-			/*

-			 * Not sure what this does, but it is absolutely

-			 * essential. Without it, the touchpad does not

-			 * work at all and the trackstick just emits normal

-			 * PS/2 packets.

-			 */

-			if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||

-			    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||

-			    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||

-			    alps_command_mode_send_nibble(psmouse, 0x9) ||

-			    alps_command_mode_send_nibble(psmouse, 0x4)) {

-				psmouse_err(psmouse,

-					    "Error sending magic E6 sequence\n");

-				goto error_passthrough;

-			}

+		if (ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||

+		    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||

+		    ps2_command(ps2dev, NULL, PSMOUSE_CMD_SETSCALE11) ||

+		    alps_command_mode_send_nibble(psmouse, 0x9) ||

+		    alps_command_mode_send_nibble(psmouse, 0x4)) {

+			psmouse_err(psmouse,

+				    "Error sending magic E6 sequence\n");

+			ret = -EIO;

+			goto error;

 		}

-		if (alps_enter_command_mode(psmouse, NULL))

-			goto error_passthrough;

-		if (alps_passthrough_mode_v3(psmouse, false))

-			goto error;

+		/*

+		 * This ensures the trackstick packets are in the format

+		 * supported by this driver. If bit 1 isn't set the packet

+		 * format is different.

+		 */

+		if (alps_enter_command_mode(psmouse, NULL) ||

+		    alps_command_mode_write_reg(psmouse,

+						reg_base + 0x08, 0x82) ||

+		    alps_exit_command_mode(psmouse))

+			ret = -EIO;

 	}

-	if (alps_absolute_mode_v3(psmouse)) {

+error:

+	if (alps_passthrough_mode_v3(psmouse, reg_base, false))

+		ret = -EIO;

+

+	return ret;

+}

+

+static int alps_hw_init_v3(struct psmouse *psmouse)

+{

+	struct ps2dev *ps2dev = &psmouse->ps2dev;

+	int reg_val;

+	unsigned char param[4];

+

+	reg_val = alps_probe_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE);

+	if (reg_val == -EIO)

+		goto error;

+	if (reg_val == 0 &&

+	    alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)

+		goto error;

+

+	if (alps_enter_command_mode(psmouse, NULL) ||

+	    alps_absolute_mode_v3(psmouse)) {

 		psmouse_err(psmouse, "Failed to enter absolute mode\n");

 		goto error;

 	}

@@ -1390,14 +1344,6 @@ static int alps_hw_init_v3(struct psmouse *psmouse)

 	if (alps_command_mode_write_reg(psmouse, 0x0162, 0x04))

 		goto error;

-	/*

-	 * This ensures the trackstick packets are in the format

-	 * supported by this driver. If bit 1 isn't set the packet

-	 * format is different.

-	 */

-	if (alps_command_mode_write_reg(psmouse, 0x0008, 0x82))

-		goto error;

-

 	alps_exit_command_mode(psmouse);

 	/* Set rate and enable data reporting */

@@ -1410,10 +1356,6 @@ static int alps_hw_init_v3(struct psmouse *psmouse)

 	return 0;

-error_passthrough:

-	/* Something failed while in passthrough mode, so try to get out */

-	if (!alps_enter_command_mode(psmouse, NULL))