[PATCH] Revert "staging: nvec: ps2: change serio type to passthrough"

[PATCH] Revert "staging: nvec: ps2: change serio type to passthrough"

[Paul Fertser]

This reverts commit 36b30d6138f4677514aca35ab76c20c1604baaad.

This is necessary to detect paz00 (ac100) touchpad properly as one
speaking ETPS/2 protocol. Without it X.org's synaptics driver doesn't
work as the touchpad is detected as an ImPS/2 mouse instead.

Commit ec6184b1c717b8768122e25fe6d312f609cc1bb4 changed the way
auto-detection is performed on ports marked as pass through and made the
issue apparent.

A pass through port is an additional PS/2 port used to connect a slave
device to a master device that is using PS/2 to communicate with the
host (so slave's PS/2 communication is tunneled over master's PS/2
link). "Synaptics PS/2 TouchPad Interfacing Guide" describes such a
setup (PS/2 PASS-THROUGH OPTION section).

Since paz00's embedded controller is not connected to a PS/2 port
itself, the PS/2 interface it exposes is not a pass-through one.

Acked-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
---
 drivers/staging/nvec/nvec_ps2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index a324322..c83eeb4 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -112,7 +112,7 @@ static int nvec_mouse_probe(struct platform_device *pdev)
 	if (!ser_dev)
 		return -ENOMEM;
 
-	ser_dev->id.type = SERIO_PS_PSTHRU;
+	ser_dev->id.type = SERIO_8042;
 	ser_dev->write = ps2_sendcommand;
 	ser_dev->start = ps2_startstreaming;
 	ser_dev->stop = ps2_stopstreaming;
-- 
2.7.0

Re: [PATCH] Revert "staging: nvec: ps2: change serio type to passthrough"

[Marc Dietrich]

[-- Attachment #1: Type: text/plain, Size: 1847 bytes --]

Hi Paul, Greg,

Am Dienstag, 25. Oktober 2016, 15:10:55 CEST schrieb Paul Fertser:
> This reverts commit 36b30d6138f4677514aca35ab76c20c1604baaad.
> 
> This is necessary to detect paz00 (ac100) touchpad properly as one
> speaking ETPS/2 protocol. Without it X.org's synaptics driver doesn't
> work as the touchpad is detected as an ImPS/2 mouse instead.
> 
> Commit ec6184b1c717b8768122e25fe6d312f609cc1bb4 changed the way
> auto-detection is performed on ports marked as pass through and made the
> issue apparent.
> 
> A pass through port is an additional PS/2 port used to connect a slave
> device to a master device that is using PS/2 to communicate with the
> host (so slave's PS/2 communication is tunneled over master's PS/2
> link). "Synaptics PS/2 TouchPad Interfacing Guide" describes such a
> setup (PS/2 PASS-THROUGH OPTION section).
> 
> Since paz00's embedded controller is not connected to a PS/2 port
> itself, the PS/2 interface it exposes is not a pass-through one.
> 
> Acked-by: Marc Dietrich <marvin24@gmx.de>
> Signed-off-by: Paul Fertser <fercerpav@gmail.com>

In fact I was a bit to fast to ack. Turns out I booted the wrong kernel. So 
please hold off this one, until some issues with this patch are fixed.

Marc


> ---
>  drivers/staging/nvec/nvec_ps2.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/nvec/nvec_ps2.c
> b/drivers/staging/nvec/nvec_ps2.c index a324322..c83eeb4 100644
> --- a/drivers/staging/nvec/nvec_ps2.c
> +++ b/drivers/staging/nvec/nvec_ps2.c
> @@ -112,7 +112,7 @@ static int nvec_mouse_probe(struct platform_device
> *pdev) if (!ser_dev)
>  		return -ENOMEM;
> 
> -	ser_dev->id.type = SERIO_PS_PSTHRU;
> +	ser_dev->id.type = SERIO_8042;
>  	ser_dev->write = ps2_sendcommand;
>  	ser_dev->start = ps2_startstreaming;
>  	ser_dev->stop = ps2_stopstreaming;


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 455 bytes --]