All of lore.kernel.org
 help / color / mirror / Atom feed
* RE: [PATCH 1/6] Input: elantech - Add the pattern for firmware into elantech_device_info structure
@ 2019-12-06  2:25 Dave.Wang
  2019-12-07 20:33 ` Dmitry Torokhov
  0 siblings, 1 reply; 3+ messages in thread
From: Dave.Wang @ 2019-12-06  2:25 UTC (permalink / raw)
  To: Linux-kernel, Linux-input, 'Benjamin Tissoires', Dmitry.torokhov
  Cc: 'Josh.Chen', jingle.wu, 'phoenix'

Add the conditional expression to distinguish different patterns regarding
0, 1, 2. Different pattern has its own location for device information.

Signed-off-by: Dave Wang <dave.wang@emc.com.tw>
---
 drivers/input/mouse/elantech.c | 11 +++++++++++
drivers/input/mouse/elantech.h |  1 +
 2 files changed, 12 insertions(+)

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 2d8434b7b623..1f0d914acd78 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1557,6 +1557,17 @@ static int elantech_set_properties(struct
elantech_device_info *info)
 		}
 	}
 
+	/* Get information pattern for hw_version 4 */
+	if (ver == 15) {
+		if ((info->fw_version & 0x0000ff) == 0x01)
+			info->pattern = 0x01;
+		else if ((info->fw_version & 0x0000ff) == 0x02)
+			info->pattern = 0x02;
+		else
+			info->pattern = 0x00;
+	} else
+		info->pattern = 0x00;
+
 	/* decide which send_cmd we're gonna use early */
 	info->send_cmd = info->hw_version >= 3 ? elantech_send_cmd :
 						 synaptics_send_cmd;
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index e0a3e59d4f1b..0aae6a9de8f0 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -140,6 +140,7 @@ struct elantech_device_info {
 	unsigned char samples[3];
 	unsigned char debug;
 	unsigned char hw_version;
+	unsigned char pattern;
 	unsigned int fw_version;
 	unsigned int x_min;
 	unsigned int y_min;
--
2.17.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/6] Input: elantech - Add the pattern for firmware into elantech_device_info structure
  2019-12-06  2:25 [PATCH 1/6] Input: elantech - Add the pattern for firmware into elantech_device_info structure Dave.Wang
@ 2019-12-07 20:33 ` Dmitry Torokhov
  0 siblings, 0 replies; 3+ messages in thread
From: Dmitry Torokhov @ 2019-12-07 20:33 UTC (permalink / raw)
  To: Dave.Wang
  Cc: Linux-kernel, Linux-input, 'Benjamin Tissoires',
	'Josh.Chen', jingle.wu, 'phoenix'

Hi Dave,

On Fri, Dec 06, 2019 at 10:25:09AM +0800, Dave.Wang wrote:
> Add the conditional expression to distinguish different patterns regarding
> 0, 1, 2. Different pattern has its own location for device information.

Your patches came in as line-wrapped by your mailer. Could you try
resending with "git send-email" please?

And could you please also add Kai-Heng Feng
<kai.heng.feng@canonical.com> to the CC as they were looking at the
bunch of laptops with Elan parts.

Thanks!

> 
> Signed-off-by: Dave Wang <dave.wang@emc.com.tw>
> ---
>  drivers/input/mouse/elantech.c | 11 +++++++++++
> drivers/input/mouse/elantech.h |  1 +
>  2 files changed, 12 insertions(+)
> 
> diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> index 2d8434b7b623..1f0d914acd78 100644
> --- a/drivers/input/mouse/elantech.c
> +++ b/drivers/input/mouse/elantech.c
> @@ -1557,6 +1557,17 @@ static int elantech_set_properties(struct
> elantech_device_info *info)
>  		}
>  	}
>  
> +	/* Get information pattern for hw_version 4 */
> +	if (ver == 15) {
> +		if ((info->fw_version & 0x0000ff) == 0x01)
> +			info->pattern = 0x01;
> +		else if ((info->fw_version & 0x0000ff) == 0x02)
> +			info->pattern = 0x02;
> +		else
> +			info->pattern = 0x00;
> +	} else
> +		info->pattern = 0x00;
> +
>  	/* decide which send_cmd we're gonna use early */
>  	info->send_cmd = info->hw_version >= 3 ? elantech_send_cmd :
>  						 synaptics_send_cmd;
> diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
> index e0a3e59d4f1b..0aae6a9de8f0 100644
> --- a/drivers/input/mouse/elantech.h
> +++ b/drivers/input/mouse/elantech.h
> @@ -140,6 +140,7 @@ struct elantech_device_info {
>  	unsigned char samples[3];
>  	unsigned char debug;
>  	unsigned char hw_version;
> +	unsigned char pattern;
>  	unsigned int fw_version;
>  	unsigned int x_min;
>  	unsigned int y_min;
> --
> 2.17.1
> 
> 

-- 
Dmitry

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH 1/6] Input: elantech - Add the pattern for firmware into elantech_device_info structure
@ 2019-12-06  2:17 Dave.Wang
  0 siblings, 0 replies; 3+ messages in thread
From: Dave.Wang @ 2019-12-06  2:17 UTC (permalink / raw)
  To: Linux-kernel, Linux-input, 'Benjamin Tissoires'
  Cc: 'Josh.Chen', jingle.wu, 'phoenix'

Add the conditional expression to distinguish different patterns
regarding 0, 1, 2. Different pattern has its own location
for device information.

Signed-off-by: Dave Wang <dave.wang@emc.com.tw>
---
 drivers/input/mouse/elantech.c | 11 +++++++++++
 drivers/input/mouse/elantech.h |  1 +
 2 files changed, 12 insertions(+)

diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
index 2d8434b7b623..1f0d914acd78 100644
--- a/drivers/input/mouse/elantech.c
+++ b/drivers/input/mouse/elantech.c
@@ -1557,6 +1557,17 @@ static int elantech_set_properties(struct
elantech_device_info *info)
 		}
 	}
 
+	/* Get information pattern for hw_version 4 */
+	if (ver == 15) {
+		if ((info->fw_version & 0x0000ff) == 0x01)
+			info->pattern = 0x01;
+		else if ((info->fw_version & 0x0000ff) == 0x02)
+			info->pattern = 0x02;
+		else
+			info->pattern = 0x00;
+	} else
+		info->pattern = 0x00;
+
 	/* decide which send_cmd we're gonna use early */
 	info->send_cmd = info->hw_version >= 3 ? elantech_send_cmd :
 						 synaptics_send_cmd;
diff --git a/drivers/input/mouse/elantech.h b/drivers/input/mouse/elantech.h
index e0a3e59d4f1b..0aae6a9de8f0 100644
--- a/drivers/input/mouse/elantech.h
+++ b/drivers/input/mouse/elantech.h
@@ -140,6 +140,7 @@ struct elantech_device_info {
 	unsigned char samples[3];
 	unsigned char debug;
 	unsigned char hw_version;
+	unsigned char pattern;
 	unsigned int fw_version;
 	unsigned int x_min;
 	unsigned int y_min;
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-12-07 20:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-06  2:25 [PATCH 1/6] Input: elantech - Add the pattern for firmware into elantech_device_info structure Dave.Wang
2019-12-07 20:33 ` Dmitry Torokhov
  -- strict thread matches above, loose matches on Subject: below --
2019-12-06  2:17 Dave.Wang

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.