| Message ID | 20200730060526.12439-1-jingle.wu@emc.com.tw (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 873a3a14a47e819bb2d1e3cf4dc8c59c200ec32b |
| Headers | show |
| Series | Input: elan_i2c - Add ic type 0x15. | expand |
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.
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) {
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(-)