Attachment 676678 Details for Bug 812111 – patch for kernel to get alps working on kernels after 3.7.x

[patch] patch for kernel to get alps working on kernels after 3.7.x

linux-3.5-e6430.patch (text/plain), 6.27 KB, created by Rodd Clarkson on 2013-01-11 06:40:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rodd Clarkson

Created: 2013-01-11 06:40:39 UTC

Size: 6.27 KB

patch

obsolete

>diff -uNrp kernel-3.5.fc17.orig/drivers/input/mouse/alps.c kernel-3.5.fc17.new/drivers/input/mouse/alps.c
>--- kernel-3.5.fc17.orig/drivers/input/mouse/alps.c	2012-08-23 20:41:18.854906657 +1000
>+++ kernel-3.5.fc17.new/drivers/input/mouse/alps.c	2012-08-23 20:39:57.508227203 +1000
>@@ -15,6 +15,7 @@
>  * the Free Software Foundation.
>  */
> 
>+#define DEBUG
> #include <linux/slab.h>
> #include <linux/input.h>
> #include <linux/input/mt.h>
>@@ -112,6 +113,8 @@ static const struct alps_model_info alps
> 	{ { 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 },
>+	/* Dell Latitude E6430 */
>+	{ { 0x73, 0x03, 0x0a }, 0x1d, ALPS_PROTO_V5, 0x8f, 0x8f, ALPS_DUALPOINT },
> };
> 
> /*
>@@ -712,6 +715,9 @@ static void alps_process_packet(struct p
> 	case ALPS_PROTO_V4:
> 		alps_process_packet_v4(psmouse);
> 		break;
>+	case ALPS_PROTO_V5:
>+		alps_process_packet_v3(psmouse);
>+		break;
> 	}
> }
> 
>@@ -1519,6 +1525,124 @@ error:
> 	return -1;
> }
> 
>+static int alps_hw_init_v5(struct psmouse *psmouse)
>+{
>+	struct ps2dev *ps2dev = &psmouse->ps2dev;
>+	unsigned char param[4];
>+	unsigned int i=0;
>+
>+#define DO_CMD(cmd) i++; \
>+	if (ps2_command(ps2dev, NULL, cmd)) { \
>+		psmouse_err(psmouse, "Failed to init: %d (cmd=%02x)\n", i, cmd); \
>+		return -1; \
>+	}
>+#define DO_CMD_ARG(arg, cmd) \
>+	i++; \
>+	param[0] = arg; \
>+	if (ps2_command(ps2dev, param, cmd)) { \
>+		psmouse_err(psmouse, "Failed to init with arg: %d (cmd=%02x, arg=%02x)\n", i, cmd, arg); \
>+		return -1; \
>+	}
>+
>+	DO_CMD(PSMOUSE_CMD_RESET_BAT);
>+	DO_CMD(PSMOUSE_CMD_RESET_BAT);
>+
>+	DO_CMD(PSMOUSE_CMD_SETSTREAM);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	DO_CMD_ARG(0, PSMOUSE_CMD_GETINFO);
>+
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	DO_CMD_ARG(0x01, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	DO_CMD_ARG(0x01, PSMOUSE_CMD_SETRES);
>+	DO_CMD_ARG(0x64, PSMOUSE_CMD_SETRATE);
>+	DO_CMD_ARG(0, PSMOUSE_CMD_GETINFO);
>+	DO_CMD_ARG(0x64, PSMOUSE_CMD_SETRATE);
>+	DO_CMD(PSMOUSE_CMD_RESET_DIS);
>+	DO_CMD(PSMOUSE_CMD_SETSTREAM);
>+
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE11);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE11);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE11);
>+	param[0] = 0xc8;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	param[0] = 0x14;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	DO_CMD(PSMOUSE_CMD_SETSTREAM);
>+
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	param[0] = 0x64;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	param[0] = 0x64;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	param[0] = 0x14;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
>+	DO_CMD(PSMOUSE_CMD_SETPOLL);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	param[0] = 0xc8;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	param[0] = 0x00;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETPOLL);
>+	DO_CMD(PSMOUSE_CMD_SETPOLL);
>+	DO_CMD(PSMOUSE_CMD_RESET_WRAP);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	param[0] = 0x01;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRES);
>+	param[0] = 0x64;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_GETINFO);
>+	param[0] = 0x64;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	DO_CMD(PSMOUSE_CMD_SETSCALE21);
>+	DO_CMD(PSMOUSE_CMD_SETSTREAM);
>+	param[0] = 0x64;
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_SETRATE);
>+	ps2_command(ps2dev, param, PSMOUSE_CMD_ENABLE);
>+
>+	return 0;
>+}
>+
> static int alps_hw_init(struct psmouse *psmouse)
> {
> 	struct alps_data *priv = psmouse->private;
>@@ -1536,6 +1660,9 @@ static int alps_hw_init(struct psmouse *
> 	case ALPS_PROTO_V4:
> 		ret = alps_hw_init_v4(psmouse);
> 		break;
>+	case ALPS_PROTO_V5:
>+		ret = alps_hw_init_v5(psmouse);
>+		break;
> 	}
> 
> 	return ret;
>@@ -1619,6 +1746,7 @@ int alps_init(struct psmouse *psmouse)
> 		break;
> 	case ALPS_PROTO_V3:
> 	case ALPS_PROTO_V4:
>+	case ALPS_PROTO_V5:
> 		set_bit(INPUT_PROP_SEMI_MT, dev1->propbit);
> 		input_mt_init_slots(dev1, 2, 0);
> 		input_set_abs_params(dev1, ABS_MT_POSITION_X, 0, ALPS_V3_X_MAX, 0, 0);
>diff -uNrp kernel-3.5.fc17.orig/drivers/input/mouse/alps.h kernel-3.5.fc17.new/drivers/input/mouse/alps.h
>--- kernel-3.5.fc17.orig/drivers/input/mouse/alps.h	2012-08-23 20:41:18.854906657 +1000
>+++ kernel-3.5.fc17.new/drivers/input/mouse/alps.h	2012-08-23 20:39:57.508227203 +1000
>@@ -16,6 +16,7 @@
> #define ALPS_PROTO_V2	1
> #define ALPS_PROTO_V3	2
> #define ALPS_PROTO_V4	3
>+#define ALPS_PROTO_V5	4
> 
> struct alps_model_info {
>         unsigned char signature[3];
>diff -uNrp kernel-3.5.fc17.orig/drivers/input/mouse/psmouse-base.c kernel-3.5.fc17.new/drivers/input/mouse/psmouse-base.c
>--- kernel-3.5.fc17.orig/drivers/input/mouse/psmouse-base.c	2012-08-23 20:41:18.854906657 +1000
>+++ kernel-3.5.fc17.new/drivers/input/mouse/psmouse-base.c	2012-08-23 20:39:57.509227177 +1000
>@@ -11,6 +11,7 @@
>  * the Free Software Foundation.
>  */
> 
>+#define DEBUG
> #define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
> #define psmouse_fmt(fmt)	fmt
>

Actions: View | Diff

Attachments on bug 812111: 596668 | 597622 | 643828 | 643927 | 676678