summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJingle Wu <jingle.wu@emc.com.tw>2020-07-30 09:31:33 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-07-30 09:34:36 +0300
commit873a3a14a47e819bb2d1e3cf4dc8c59c200ec32b (patch)
treec401b467aa10c3de6b2c9aebfde2a3802f964bdd /drivers/input
parent74d905d2d38ad00246e1f22c6ccad7ebb5731839 (diff)
downloadlinux-873a3a14a47e819bb2d1e3cf4dc8c59c200ec32b.tar.xz
Input: elan_i2c - add ic type 0x15
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>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/mouse/elan_i2c_core.c3
1 files changed, 2 insertions, 1 deletions
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) {