summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2019-10-09 12:03:27 +0800
committerCommit Bot <commit-bot@chromium.org>2019-10-18 08:52:46 +0000
commit5f3380d0a80dcedb6cb120b9e4c420b66b747a95 (patch)
treebc7e95388a0f9e6179f2482cadaea829e008628e /driver
parentb9b9c35c38b50908cc5985d75947aeb3aa1571ce (diff)
downloadchrome-ec-5f3380d0a80dcedb6cb120b9e4c420b66b747a95.tar.gz
board/hammer: Fix masterball touchpad settings
Fix the dimensions, and also the size, and make sure that updating the FW actually works (it seems like increasing the timeout to 2000ms is needed). BRANCH=kukui BUG=b:140596094 TEST=Flash masterball, no warning in console on start TEST= Host: make TOUCHPAD_FW=S8648A-15H0_FW01.bin BOARD=masterball -j USE=updater_utils emerge-kukui -av ec-utils cros deploy $IP ec-utils DUT: usb_updater2 -d 18d1:503c -r; sleep 0.5; \ usb_updater2 -d 18d1:503c -s; usb_updater2 -d 18d1:503c ec.bin usb_updater2 -d 18d1:503c -p S8648A-15H0_FW01.bin Change-Id: Ia473ac420b42f52ad1639f950a3f08ff5d32df09 Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1847512 Reviewed-by: Eric Yilun Lin <yllin@chromium.org> Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'driver')
-rw-r--r--driver/touchpad_elan.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/driver/touchpad_elan.c b/driver/touchpad_elan.c
index ace80c3b70..4c7cb91a61 100644
--- a/driver/touchpad_elan.c
+++ b/driver/touchpad_elan.c
@@ -413,6 +413,7 @@ static int elan_get_ic_page_count(void)
case 0x0D:
return 896;
case 0x00:
+ case 0x10:
return 1024;
}
return -1;
@@ -531,9 +532,10 @@ int touchpad_update_write(int offset, int size, const uint8_t *data)
rv = touchpad_update_page(data + addr - offset);
if (rv)
return rv;
- CPRINTS("%s: page %d updated.", __func__, addr / FW_PAGE_SIZE);
+ CPRINTF("/p%d", addr / FW_PAGE_SIZE);
watchdog_reload();
}
+ CPRINTF("\n");
if (offset + size == FW_SIZE) {
CPRINTS("%s: End update, wait for reset.", __func__);