[PATCH] Input: ALPS - Recognise "Dolphin V2" touchpads

[PATCH] Input: ALPS - Recognise "Dolphin V2" touchpads

[Chris Diamand]

This is the touchpad used on the Dell Vostro 3360. Without
this change, the driver reports this as follows:

psmouse serio1: alps: Unknown ALPS touchpad: E7=73 03 50, EC=73 02 02

It seems to use the ALPS V5 protocol, so identify it
as such by allowing ec[1] == 0x02.

This is based on src/alps.c from the DKMS driver here:
http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/

Signed-off-by: Chris Diamand <chris@diamand.org>
---
 drivers/input/mouse/alps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 5cf62e3..d5d15eb 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1845,7 +1845,7 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
 	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) {
+		   ec[0] == 0x73 && (ec[1] == 0x01 || ec[1] == 0x02)) {
 		priv->proto_version = ALPS_PROTO_V5;
 		alps_set_defaults(priv);
 
-- 
1.8.5.2

Re: [PATCH] Input: ALPS - Recognise "Dolphin V2" touchpads

[Tommy Will]

Hi Chris,

> This is the touchpad used on the Dell Vostro 3360. Without
> this change, the driver reports this as follows:

> psmouse serio1: alps: Unknown ALPS touchpad: E7=73 03 50, EC=73 02 02

> It seems to use the ALPS V5 protocol, so identify it
> as such by allowing ec[1] == 0x02.

> This is based on src/alps.c from the DKMS driver here:
> http://www.dahetral.com/public-download/alps-psmouse-dlkm-for-3-2-and-3-5/

Thanks for your patch!
Umm, however, I had submited a similar patch for supporting dolphin v2
device last month and it was now applied into latest mainline. Detail
please check the source code in below link.

    git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git

Thanks
-- 
Best Regards,
Tommy

Re: [PATCH] Input: ALPS - Recognise "Dolphin V2" touchpads

[Chris Diamand]

Hi, and thanks for your reply.

> Umm, however, I had submited a similar patch for supporting dolphin v2
> device last month and it was now applied into latest mainline.

Do you mean commit 'ee65d4...add support for "Dolphin" devices'?

It's in the dtor/input.git kernel but I don't think it's been merged 
into mainline (torvalds/linux.git).

Running 'git log drivers/input/mouse/alps.c' with the latest mainline 
kernel shows the last commit as '95f75e...add support for DualPoint 
device on Dell XT2 model', which doesn't work with my device (Dell 
Vostro 3360).

Are there any plans for it to be merged? It looks like your patch fixes 
it much better than mine ;)

Regards,
Chris

Re: [PATCH] Input: ALPS - Recognise "Dolphin V2" touchpads

[Dmitry Torokhov]

Hi Chris,

On Tue, Jan 07, 2014 at 06:30:29PM +0000, Chris Diamand wrote:
> Hi, and thanks for your reply.
> 
> >Umm, however, I had submited a similar patch for supporting dolphin v2
> >device last month and it was now applied into latest mainline.
> 
> Do you mean commit 'ee65d4...add support for "Dolphin" devices'?
> 
> It's in the dtor/input.git kernel but I don't think it's been merged
> into mainline (torvalds/linux.git).
> 
> Running 'git log drivers/input/mouse/alps.c' with the latest
> mainline kernel shows the last commit as '95f75e...add support for
> DualPoint device on Dell XT2 model', which doesn't work with my
> device (Dell Vostro 3360).
> 
> Are there any plans for it to be merged? It looks like your patch
> fixes it much better than mine ;)

Yes, it will be merged together with all other changes to the input
subsystem when the next merge window opens.

Thanks.

-- 
Dmitry