* [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present
@ 2015-03-22 13:47 Pali Rohár
2015-03-23 11:42 ` Hans de Goede
0 siblings, 1 reply; 4+ messages in thread
From: Pali Rohár @ 2015-03-22 13:47 UTC (permalink / raw)
To: Hans de Goede, Dmitry Torokhov; +Cc: linux-input, linux-kernel, Pali Rohár
This patch move v3 pinnacle code for trackstick detection from alps_hw_init_v3()
to alps_set_protocol() so ALPS_DUALPOINT flag can be cleared before registering
trackstick input device in kernel.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
drivers/input/mouse/alps.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index c9cd27a..d24e98d 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1877,15 +1877,12 @@ error:
static int alps_hw_init_v3(struct psmouse *psmouse)
{
+ struct alps_data *priv = psmouse->private;
struct ps2dev *ps2dev = &psmouse->ps2dev;
int reg_val;
unsigned char param[4];
- reg_val = alps_probe_trackstick_v3_v7(psmouse, ALPS_REG_BASE_PINNACLE);
- if (reg_val == -EIO)
- goto error;
-
- if (reg_val == 0 &&
+ if ((priv->flags & ALPS_DUALPOINT) &&
alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
goto error;
@@ -2249,6 +2246,11 @@ static int alps_set_protocol(struct psmouse *psmouse,
priv->decode_fields = alps_decode_pinnacle;
priv->nibble_commands = alps_v3_nibble_commands;
priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
+
+ if (alps_probe_trackstick_v3_v7(psmouse,
+ ALPS_REG_BASE_PINNACLE) < 0)
+ priv->flags &= ~ALPS_DUALPOINT;
+
break;
case ALPS_PROTO_V3_RUSHMORE:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present
2015-03-22 13:47 [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present Pali Rohár
@ 2015-03-23 11:42 ` Hans de Goede
2016-01-05 16:54 ` Pali Rohár
0 siblings, 1 reply; 4+ messages in thread
From: Hans de Goede @ 2015-03-23 11:42 UTC (permalink / raw)
To: Pali Rohár, Dmitry Torokhov; +Cc: linux-input, linux-kernel
Hi,
On 22-03-15 14:47, Pali Rohár wrote:
> This patch move v3 pinnacle code for trackstick detection from alps_hw_init_v3()
> to alps_set_protocol() so ALPS_DUALPOINT flag can be cleared before registering
> trackstick input device in kernel.
>
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Looks good:
Acked-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/input/mouse/alps.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> index c9cd27a..d24e98d 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -1877,15 +1877,12 @@ error:
>
> static int alps_hw_init_v3(struct psmouse *psmouse)
> {
> + struct alps_data *priv = psmouse->private;
> struct ps2dev *ps2dev = &psmouse->ps2dev;
> int reg_val;
> unsigned char param[4];
>
> - reg_val = alps_probe_trackstick_v3_v7(psmouse, ALPS_REG_BASE_PINNACLE);
> - if (reg_val == -EIO)
> - goto error;
> -
> - if (reg_val == 0 &&
> + if ((priv->flags & ALPS_DUALPOINT) &&
> alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
> goto error;
>
> @@ -2249,6 +2246,11 @@ static int alps_set_protocol(struct psmouse *psmouse,
> priv->decode_fields = alps_decode_pinnacle;
> priv->nibble_commands = alps_v3_nibble_commands;
> priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
> +
> + if (alps_probe_trackstick_v3_v7(psmouse,
> + ALPS_REG_BASE_PINNACLE) < 0)
> + priv->flags &= ~ALPS_DUALPOINT;
> +
> break;
>
> case ALPS_PROTO_V3_RUSHMORE:
>
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present
2015-03-23 11:42 ` Hans de Goede
@ 2016-01-05 16:54 ` Pali Rohár
2016-01-07 0:00 ` Dmitry Torokhov
0 siblings, 1 reply; 4+ messages in thread
From: Pali Rohár @ 2016-01-05 16:54 UTC (permalink / raw)
To: Hans de Goede; +Cc: Dmitry Torokhov, linux-input, linux-kernel
On Monday 23 March 2015 12:42:25 Hans de Goede wrote:
> Hi,
>
> On 22-03-15 14:47, Pali Rohár wrote:
> >This patch move v3 pinnacle code for trackstick detection from alps_hw_init_v3()
> >to alps_set_protocol() so ALPS_DUALPOINT flag can be cleared before registering
> >trackstick input device in kernel.
> >
> >Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
>
> Looks good:
>
> Acked-by: Hans de Goede <hdegoede@redhat.com>
>
> Regards,
>
> Hans
>
Hi Hans! I would like to remind this patch as it stays here on ML.
>
> >---
> > drivers/input/mouse/alps.c | 12 +++++++-----
> > 1 file changed, 7 insertions(+), 5 deletions(-)
> >
> >diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> >index c9cd27a..d24e98d 100644
> >--- a/drivers/input/mouse/alps.c
> >+++ b/drivers/input/mouse/alps.c
> >@@ -1877,15 +1877,12 @@ error:
> >
> > static int alps_hw_init_v3(struct psmouse *psmouse)
> > {
> >+ struct alps_data *priv = psmouse->private;
> > struct ps2dev *ps2dev = &psmouse->ps2dev;
> > int reg_val;
> > unsigned char param[4];
> >
> >- reg_val = alps_probe_trackstick_v3_v7(psmouse, ALPS_REG_BASE_PINNACLE);
> >- if (reg_val == -EIO)
> >- goto error;
> >-
> >- if (reg_val == 0 &&
> >+ if ((priv->flags & ALPS_DUALPOINT) &&
> > alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
> > goto error;
> >
> >@@ -2249,6 +2246,11 @@ static int alps_set_protocol(struct psmouse *psmouse,
> > priv->decode_fields = alps_decode_pinnacle;
> > priv->nibble_commands = alps_v3_nibble_commands;
> > priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
> >+
> >+ if (alps_probe_trackstick_v3_v7(psmouse,
> >+ ALPS_REG_BASE_PINNACLE) < 0)
> >+ priv->flags &= ~ALPS_DUALPOINT;
> >+
> > break;
> >
> > case ALPS_PROTO_V3_RUSHMORE:
> >
--
Pali Rohár
pali.rohar@gmail.com
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present
2016-01-05 16:54 ` Pali Rohár
@ 2016-01-07 0:00 ` Dmitry Torokhov
0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2016-01-07 0:00 UTC (permalink / raw)
To: Pali Rohár; +Cc: Hans de Goede, linux-input, linux-kernel
On Tue, Jan 05, 2016 at 05:54:19PM +0100, Pali Rohár wrote:
> On Monday 23 March 2015 12:42:25 Hans de Goede wrote:
> > Hi,
> >
> > On 22-03-15 14:47, Pali Rohár wrote:
> > >This patch move v3 pinnacle code for trackstick detection from alps_hw_init_v3()
> > >to alps_set_protocol() so ALPS_DUALPOINT flag can be cleared before registering
> > >trackstick input device in kernel.
> > >
> > >Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> >
> > Looks good:
> >
> > Acked-by: Hans de Goede <hdegoede@redhat.com>
> >
> > Regards,
> >
> > Hans
> >
>
> Hi Hans! I would like to remind this patch as it stays here on ML.
Applied, thank you.
>
> >
> > >---
> > > drivers/input/mouse/alps.c | 12 +++++++-----
> > > 1 file changed, 7 insertions(+), 5 deletions(-)
> > >
> > >diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> > >index c9cd27a..d24e98d 100644
> > >--- a/drivers/input/mouse/alps.c
> > >+++ b/drivers/input/mouse/alps.c
> > >@@ -1877,15 +1877,12 @@ error:
> > >
> > > static int alps_hw_init_v3(struct psmouse *psmouse)
> > > {
> > >+ struct alps_data *priv = psmouse->private;
> > > struct ps2dev *ps2dev = &psmouse->ps2dev;
> > > int reg_val;
> > > unsigned char param[4];
> > >
> > >- reg_val = alps_probe_trackstick_v3_v7(psmouse, ALPS_REG_BASE_PINNACLE);
> > >- if (reg_val == -EIO)
> > >- goto error;
> > >-
> > >- if (reg_val == 0 &&
> > >+ if ((priv->flags & ALPS_DUALPOINT) &&
> > > alps_setup_trackstick_v3(psmouse, ALPS_REG_BASE_PINNACLE) == -EIO)
> > > goto error;
> > >
> > >@@ -2249,6 +2246,11 @@ static int alps_set_protocol(struct psmouse *psmouse,
> > > priv->decode_fields = alps_decode_pinnacle;
> > > priv->nibble_commands = alps_v3_nibble_commands;
> > > priv->addr_command = PSMOUSE_CMD_RESET_WRAP;
> > >+
> > >+ if (alps_probe_trackstick_v3_v7(psmouse,
> > >+ ALPS_REG_BASE_PINNACLE) < 0)
> > >+ priv->flags &= ~ALPS_DUALPOINT;
> > >+
> > > break;
> > >
> > > case ALPS_PROTO_V3_RUSHMORE:
> > >
>
> --
> Pali Rohár
> pali.rohar@gmail.com
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-07 0:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-22 13:47 [PATCH] Input: ALPS - Report v3 pinnacle trackstick device only if is present Pali Rohár
2015-03-23 11:42 ` Hans de Goede
2016-01-05 16:54 ` Pali Rohár
2016-01-07 0:00 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).