projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74d905d
)
Input: elan_i2c - add ic type 0x15
author
Jingle Wu
<jingle.wu@emc.com.tw>
Thu, 30 Jul 2020 06:31:33 +0000
(23:31 -0700)
committer
Dmitry Torokhov
<dmitry.torokhov@gmail.com>
Thu, 30 Jul 2020 06:34:36 +0000
(23:34 -0700)
The update firmware flow of ic type 0x15 is same with ic type 0x14.
Signed-off-by: Jingle Wu <jingle.wu@emc.com.tw>
Link:
https://lore.kernel.org/r/20200730060526.12439-1-jingle.wu@emc.com.tw
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/mouse/elan_i2c_core.c
patch
|
blob
|
history
diff --git
a/drivers/input/mouse/elan_i2c_core.c
b/drivers/input/mouse/elan_i2c_core.c
index 8a0f224da4237cfe6070b237dee1045a83772b62..c599e21a8478439f218531cedf1d54d24703f542 100644
(file)
--- 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) {