[PATCH] Input: elantech - add more IC body types to the list

[PATCH] Input: elantech - add more IC body types to the list

[Dmitry Torokhov]

The touchpad in HP Pavilion 14-ab057ca reports it's version as 12 and
according to Elan both 11 and 12 are valid IC types and should be
identified as hw_version 4.

Reported-by: Patrick Lessard <Patrick.Lessard@cogeco.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/mouse/elantech.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index e0fbd42..615d23e 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1568,13 +1568,7 @@ static int elantech_set_properties(struct elantech_data *etd)
 		case 5:
 			etd->hw_version = 3;
 			break;
-		case 6:
-		case 7:
-		case 8:
-		case 9:
-		case 10:
-		case 13:
-		case 14:
+		case 6 ... 14:
 			etd->hw_version = 4;
 			break;
 		default:
-- 
2.8.0.rc3.226.g39d4020


-- 
Dmitry

Re: [PATCH] Input: elantech - add more IC body types to the list

[Dmitry Torokhov]

On Tue, Jun 21, 2016 at 04:15:35PM -0700, Dmitry Torokhov wrote:
> The touchpad in HP Pavilion 14-ab057ca reports it's version as 12 and
> according to Elan both 11 and 12 are valid IC types and should be
> identified as hw_version 4.
> 
> Reported-by: Patrick Lessard <Patrick.Lessard@cogeco.com>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Patrick, could you please give this patch a quick spin so I could queue
it for 4.7 and stable?

Thanks!

> ---
>  drivers/input/mouse/elantech.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index e0fbd42..615d23e 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1568,13 +1568,7 @@ static int elantech_set_properties(struct elantech_data *etd)
>  		case 5:
>  			etd->hw_version = 3;
>  			break;
> -		case 6:
> -		case 7:
> -		case 8:
> -		case 9:
> -		case 10:
> -		case 13:
> -		case 14:
> +		case 6 ... 14:
>  			etd->hw_version = 4;
>  			break;
>  		default:
> -- 
> 2.8.0.rc3.226.g39d4020
> 
> 
> -- 
> Dmitry

-- 
Dmitry

RE: [PATCH] Input: elantech - add more IC body types to the list

[Patrick Lessard]

Hello Dmitry,

Tested against 4.6.2 and it works fine!

Here is a little log:

[manager@archlaptop linux-4.6.2]$ cat elantech.patch
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1568,13 +1568,7 @@ static int elantech_set_properties(struct elantech_data *etd)
                case 5:
                        etd->hw_version = 3;
                        break;
-               case 6:
-               case 7:
-               case 8:
-               case 9:
-               case 10:
-               case 13:
-               case 14:
+               case 6 ... 14:
                        etd->hw_version = 4;
                        break;
                default:


[manager@archlaptop linux-4.6.2]$ patch -p1 < elantech.patch
patching file drivers/input/mouse/elantech.c


[manager@archlaptop linux-4.6.2]$ make
  CHK     include/config/kernel.release
  CHK     include/generated/uapi/linux/version.h
  CHK     include/generated/utsrelease.h
  CHK     include/generated/timeconst.h
  CHK     include/generated/bounds.h
  CHK     include/generated/asm-offsets.h
  CALL    scripts/checksyscalls.sh
  DESCEND  objtool
  CHK     include/generated/compile.h
  CHK     kernel/config_data.h
  CC [M]  drivers/input/mouse/elantech.o
  LD [M]  drivers/input/mouse/psmouse.o
Kernel: arch/x86/boot/bzImage is ready  (#1)
  Building modules, stage 2.
  MODPOST 3718 modules
  LD [M]  drivers/input/mouse/psmouse.ko


[manager@archlaptop ~]$ dmesg | grep psmouse
[    9.000544] psmouse serio1: elantech: assuming hardware version 4 (with firmware version 0x5c1f04)
[    9.017221] psmouse serio1: elantech: Synaptics capabilities query result 0x10, 0x16, 0x0d.
[    9.032498] psmouse serio1: elantech: Elan sample query result 0d, 01, 86

Thank you.

Patrick



The information in this message, including in all attachments, is
confidential or privileged. In the event you have received this message in error
and are not the intended recipient, you are hereby advised that any use, copying
or reproduction of this document is strictly forbidden. Please notify
immediately the sender of this error and destroy this message, including its
attachments, as the case may be.
</P>
L'information apparaissant dans ce message electronique et dans les documents
qui y sont joints est de nature confidentielle ou privilegiee. Si ce message
vous est parvenu par erreur et que vous n'en etes pas le destinataire vise, vous
etes par les presentes avise que toute utilisation, copie ou distribution de ce
message est strictement interdite. Vous etes donc prie d'en informer
immediatement l'expediteur et de detruire ce message, ainsi que les documents
qui y sont joints, le cas echeant.</FONT>






Ce courriel provient de Patrick.Lessard@cogeco.com . Pour assurer la livraison de futurs envois, veuillez inclure la presente adresse courriel a votre carnet
d'adresses ou votre liste d'expediteurs autorises.
Si vous ne souhaitez plus recevoir de messages promotionnels de la part de Cogeco, veuillez transférer ce courriel a desabonnement@cogeco.com. Merci!
Politique en matiere de protection des renseignements personnels de Cogeco et Engagement en matiere d'anti-spam - Contactez-nous
Cogeco Cable Canada, 5 Place Ville-Marie, Bureau 1700, Montreal, Quebec, H3B 0B3
--
This email is from Patrick.Lessard@cogeco.com . To ensure the delivery of future emails, please add the current email address to your address book or safe senders list.
If you no longer wish to receive promotional emails from Cogeco, please forward this message to unsubscribe@cogeco.com. Thank you!
Privacy Policy and Anti-spam Commitment - Contact us
Cogeco Cable Canada, 5 Place Ville-Marie, Suite 1700, Montreal, Quebec, H3B 0B3

-----Message d'origine-----
De : Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com]
Envoyé : 23 juin 2016 13:45
À : linux-input@vger.kernel.org
Cc : Benjamin Tissoires; kt.liao@emc.com.tw; Patrick Lessard; linux-kernel@vger.kernel.org
Objet : Re: [PATCH] Input: elantech - add more IC body types to the list

On Tue, Jun 21, 2016 at 04:15:35PM -0700, Dmitry Torokhov wrote:
> The touchpad in HP Pavilion 14-ab057ca reports it's version as 12 and
> according to Elan both 11 and 12 are valid IC types and should be
> identified as hw_version 4.
>
> Reported-by: Patrick Lessard <Patrick.Lessard@cogeco.com>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Patrick, could you please give this patch a quick spin so I could queue it for 4.7 and stable?

Thanks!

> ---
>  drivers/input/mouse/elantech.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/input/mouse/elantech.c
> b/drivers/input/mouse/elantech.c index e0fbd42..615d23e 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1568,13 +1568,7 @@ static int elantech_set_properties(struct elantech_data *etd)
>               case 5:
>                       etd->hw_version = 3;
>                       break;
> -             case 6:
> -             case 7:
> -             case 8:
> -             case 9:
> -             case 10:
> -             case 13:
> -             case 14:
> +             case 6 ... 14:
>                       etd->hw_version = 4;
>                       break;
>               default:
> --
> 2.8.0.rc3.226.g39d4020
>
>
> --
> Dmitry

--
Dmitry

Re: [PATCH] Input: elantech - add more IC body types to the list

['Dmitry Torokhov']

On Thu, Jun 23, 2016 at 07:25:24PM +0000, Patrick Lessard wrote:
> Hello Dmitry,
> 
> Tested against 4.6.2 and it works fine!

Awesome, thank you!

> 
> Here is a little log:
> 
> [manager@archlaptop linux-4.6.2]$ cat elantech.patch
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1568,13 +1568,7 @@ static int elantech_set_properties(struct elantech_data *etd)
>                 case 5:
>                         etd->hw_version = 3;
>                         break;
> -               case 6:
> -               case 7:
> -               case 8:
> -               case 9:
> -               case 10:
> -               case 13:
> -               case 14:
> +               case 6 ... 14:
>                         etd->hw_version = 4;
>                         break;
>                 default:
> 
> 
> [manager@archlaptop linux-4.6.2]$ patch -p1 < elantech.patch
> patching file drivers/input/mouse/elantech.c
> 
> 
> [manager@archlaptop linux-4.6.2]$ make
>   CHK     include/config/kernel.release
>   CHK     include/generated/uapi/linux/version.h
>   CHK     include/generated/utsrelease.h
>   CHK     include/generated/timeconst.h
>   CHK     include/generated/bounds.h
>   CHK     include/generated/asm-offsets.h
>   CALL    scripts/checksyscalls.sh
>   DESCEND  objtool
>   CHK     include/generated/compile.h
>   CHK     kernel/config_data.h
>   CC [M]  drivers/input/mouse/elantech.o
>   LD [M]  drivers/input/mouse/psmouse.o
> Kernel: arch/x86/boot/bzImage is ready  (#1)
>   Building modules, stage 2.
>   MODPOST 3718 modules
>   LD [M]  drivers/input/mouse/psmouse.ko
> 
> 
> [manager@archlaptop ~]$ dmesg | grep psmouse
> [    9.000544] psmouse serio1: elantech: assuming hardware version 4 (with firmware version 0x5c1f04)
> [    9.017221] psmouse serio1: elantech: Synaptics capabilities query result 0x10, 0x16, 0x0d.
> [    9.032498] psmouse serio1: elantech: Elan sample query result 0d, 01, 86
> 
> Thank you.
> 
> Patrick
> 
> 
> 
> The information in this message, including in all attachments, is
> confidential or privileged. In the event you have received this message in error
> and are not the intended recipient, you are hereby advised that any use, copying
> or reproduction of this document is strictly forbidden. Please notify
> immediately the sender of this error and destroy this message, including its
> attachments, as the case may be.
> </P>
> L'information apparaissant dans ce message electronique et dans les documents
> qui y sont joints est de nature confidentielle ou privilegiee. Si ce message
> vous est parvenu par erreur et que vous n'en etes pas le destinataire vise, vous
> etes par les presentes avise que toute utilisation, copie ou distribution de ce
> message est strictement interdite. Vous etes donc prie d'en informer
> immediatement l'expediteur et de detruire ce message, ainsi que les documents
> qui y sont joints, le cas echeant.</FONT>
> 
> 
> 
> 
> 
> 
> Ce courriel provient de Patrick.Lessard@cogeco.com . Pour assurer la livraison de futurs envois, veuillez inclure la presente adresse courriel a votre carnet
> d'adresses ou votre liste d'expediteurs autorises.
> Si vous ne souhaitez plus recevoir de messages promotionnels de la part de Cogeco, veuillez transférer ce courriel a desabonnement@cogeco.com. Merci!
> Politique en matiere de protection des renseignements personnels de Cogeco et Engagement en matiere d'anti-spam - Contactez-nous
> Cogeco Cable Canada, 5 Place Ville-Marie, Bureau 1700, Montreal, Quebec, H3B 0B3
> --
> This email is from Patrick.Lessard@cogeco.com . To ensure the delivery of future emails, please add the current email address to your address book or safe senders list.
> If you no longer wish to receive promotional emails from Cogeco, please forward this message to unsubscribe@cogeco.com. Thank you!
> Privacy Policy and Anti-spam Commitment - Contact us
> Cogeco Cable Canada, 5 Place Ville-Marie, Suite 1700, Montreal, Quebec, H3B 0B3
> 
> -----Message d'origine-----
> De : Dmitry Torokhov [mailto:dmitry.torokhov@gmail.com]
> Envoyé : 23 juin 2016 13:45
> À : linux-input@vger.kernel.org
> Cc : Benjamin Tissoires; kt.liao@emc.com.tw; Patrick Lessard; linux-kernel@vger.kernel.org
> Objet : Re: [PATCH] Input: elantech - add more IC body types to the list
> 
> On Tue, Jun 21, 2016 at 04:15:35PM -0700, Dmitry Torokhov wrote:
> > The touchpad in HP Pavilion 14-ab057ca reports it's version as 12 and
> > according to Elan both 11 and 12 are valid IC types and should be
> > identified as hw_version 4.
> >
> > Reported-by: Patrick Lessard <Patrick.Lessard@cogeco.com>
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> 
> Patrick, could you please give this patch a quick spin so I could queue it for 4.7 and stable?
> 
> Thanks!
> 
> > ---
> >  drivers/input/mouse/elantech.c | 8 +-------
> >  1 file changed, 1 insertion(+), 7 deletions(-)
> >
> > diff --git a/drivers/input/mouse/elantech.c
> > b/drivers/input/mouse/elantech.c index e0fbd42..615d23e 100644
> > --- a/drivers/input/mouse/elantech.c
> > +++ b/drivers/input/mouse/elantech.c
> > @@ -1568,13 +1568,7 @@ static int elantech_set_properties(struct elantech_data *etd)
> >               case 5:
> >                       etd->hw_version = 3;
> >                       break;
> > -             case 6:
> > -             case 7:
> > -             case 8:
> > -             case 9:
> > -             case 10:
> > -             case 13:
> > -             case 14:
> > +             case 6 ... 14:
> >                       etd->hw_version = 4;
> >                       break;
> >               default:
> > --
> > 2.8.0.rc3.226.g39d4020
> >
> >
> > --
> > Dmitry
> 
> --
> Dmitry

-- 
Dmitry