diff options
author | Ting Shen <phoenixshen@google.com> | 2021-05-05 18:30:36 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-05-05 18:11:27 +0000 |
commit | f11262b8a4c3753912af8c6bf5360ba015887a5d (patch) | |
tree | 33a1e9b274f37d09a3689db9bca72467533e0606 | |
parent | 1bf17065d757a4de89691fe44900eb9ac20e1c63 (diff) | |
download | chrome-ec-f11262b8a4c3753912af8c6bf5360ba015887a5d.tar.gz |
touchpad_elan: add ic type 0x15 support
Sync the elan_get_fwinfo function from kernel v5.12 to ec codebase.
BUG=b:183899273
TEST=no "unknown ic_type: 21" in ec console
BRANCH=trogdor
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: I0499d2666151448a504d1759d1ee6c3f5376a97a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2874946
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r-- | driver/touchpad_elan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/driver/touchpad_elan.c b/driver/touchpad_elan.c index 6cd07dd2c2..06a6b1ed13 100644 --- a/driver/touchpad_elan.c +++ b/driver/touchpad_elan.c @@ -292,6 +292,7 @@ static int elan_get_fwinfo(void) case 0x00: case 0x10: case 0x14: + case 0x15: elan_tp_params.page_count = 1024; break; default: @@ -299,7 +300,7 @@ static int elan_get_fwinfo(void) return EC_ERROR_UNKNOWN; } - if (ic_type == 0x14 && iap_version >= 2) { + if ((ic_type == 0x14 || ic_type == 0x15) && iap_version >= 2) { elan_tp_params.page_count /= 8; elan_tp_params.page_size = 512; } else if (ic_type >= 0x0D && iap_version >= 1) { |