* [PATCH] Input: elan_i2c - Add ic type 0x15.
@ 2020-07-30 6:05 Jingle Wu
2020-07-30 6:31 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Jingle Wu @ 2020-07-30 6:05 UTC (permalink / raw)
To: linux-kernel, linux-input, dmitry.torokhov
Cc: phoenix, josh.chen, dave.wang, kai.heng.feng, Jingle Wu
The update firmware flow of ic type 0x15 is same with ic type 0x14.
Signed-off-by: Jingle Wu <jingle.wu@emc.com.tw>
---
drivers/input/mouse/elan_i2c_core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 8a0f224da423..c599e21a8478 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -138,6 +138,7 @@ static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count,
*validpage_count = 2048;
break;
case 0x14:
+ case 0x15:
*validpage_count = 1024;
break;
default:
@@ -151,7 +152,7 @@ static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count,
*signature_address =
(*validpage_count * ETP_FW_PAGE_SIZE) - ETP_FW_SIGNATURE_SIZE;
- if (ic_type == 0x14 && iap_version >= 2) {
+ if ((ic_type == 0x14 || ic_type == 0x15) && iap_version >= 2) {
*validpage_count /= 8;
*page_size = ETP_FW_PAGE_SIZE_512;
} else if (ic_type >= 0x0D && iap_version >= 1) {
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Input: elan_i2c - Add ic type 0x15.
2020-07-30 6:05 [PATCH] Input: elan_i2c - Add ic type 0x15 Jingle Wu
@ 2020-07-30 6:31 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2020-07-30 6:31 UTC (permalink / raw)
To: Jingle Wu
Cc: linux-kernel, linux-input, phoenix, josh.chen, dave.wang, kai.heng.feng
On Thu, Jul 30, 2020 at 02:05:26AM -0400, Jingle Wu wrote:
> The update firmware flow of ic type 0x15 is same with ic type 0x14.
>
> Signed-off-by: Jingle Wu <jingle.wu@emc.com.tw>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-30 6:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-30 6:05 [PATCH] Input: elan_i2c - Add ic type 0x15 Jingle Wu
2020-07-30 6:31 ` 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).