diff options
| author | Nicolas Boichat <drinkcat@google.com> | 2017-07-10 08:24:13 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-08-03 00:32:05 -0700 |
| commit | e525e1af8a9d89fe1613238b4a5eb458e7f5c7de (patch) | |
| tree | 04690eea15be6fc1de7952d7f803fe6ac20745ed /driver/touchpad_elan.c | |
| parent | 959452ac9744c981dd2c94f4ef680e8ed3df76a0 (diff) | |
| download | chrome-ec-e525e1af8a9d89fe1613238b4a5eb458e7f5c7de.tar.gz | |
usb_update: Add a way to fetch touchpad information
We'd like to know touchpad vendor/product id, as well as currently
running FW version. This CL does that by adding a new
UPDATE_EXTRA_CMD_TOUCHPAD_INFO command.
We also make the interface more generic by adding a CONFIG_TOUCHPAD
configuration option, even though we only support Elan touchpads
currently.
BRANCH=none
BUG=b:63418037
TEST=Flash hammer, ./usb_updater -t
Change-Id: Icce3c785eb3235bcc50b2ae7c0227ce11cbc9f2b
Signed-off-by: Nicolas Boichat <drinkcat@google.com>
Reviewed-on: https://chromium-review.googlesource.com/593000
Commit-Ready: Nicolas Boichat <drinkcat@chromium.org>
Tested-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Chun-ta Lin <itspeter@chromium.org>
Diffstat (limited to 'driver/touchpad_elan.c')
| -rw-r--r-- | driver/touchpad_elan.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/driver/touchpad_elan.c b/driver/touchpad_elan.c index 3c8d5abeae..8262a2dcdc 100644 --- a/driver/touchpad_elan.c +++ b/driver/touchpad_elan.c @@ -10,6 +10,7 @@ #include "i2c.h" #include "task.h" #include "timer.h" +#include "update_fw.h" #include "util.h" #include "usb_hid_touchpad.h" @@ -22,16 +23,21 @@ /* How to talk to the controller */ /******************************************************************************/ +#define ELAN_VENDOR_ID 0x04f3 + #define ETP_I2C_RESET 0x0100 #define ETP_I2C_WAKE_UP 0x0800 #define ETP_I2C_SLEEP 0x0801 #define ETP_I2C_STAND_CMD 0x0005 +#define ETP_I2C_UNIQUEID_CMD 0x0101 +#define ETP_I2C_FW_VERSION_CMD 0x0102 #define ETP_I2C_XY_TRACENUM_CMD 0x0105 #define ETP_I2C_MAX_X_AXIS_CMD 0x0106 #define ETP_I2C_MAX_Y_AXIS_CMD 0x0107 #define ETP_I2C_RESOLUTION_CMD 0x0108 #define ETP_I2C_PRESSURE_CMD 0x010A #define ETP_I2C_SET_CMD 0x0300 +#define ETP_I2C_FW_CHECKSUM_CMD 0x030F #define ETP_ENABLE_ABS 0x0001 @@ -277,6 +283,35 @@ out: return rv; } +#ifdef CONFIG_USB_UPDATE +int touchpad_get_info(struct touchpad_info *tp) +{ + int rv; + uint16_t val; + + tp->status = EC_RES_SUCCESS; + tp->vendor = ELAN_VENDOR_ID; + + /* Get unique ID, FW, SM version. */ + rv = elan_tp_read_cmd(ETP_I2C_UNIQUEID_CMD, &val); + if (rv) + return -1; + tp->elan.id = val; + + rv = elan_tp_read_cmd(ETP_I2C_FW_VERSION_CMD, &val); + if (rv) + return -1; + tp->elan.fw_version = val & 0xff; + + rv = elan_tp_read_cmd(ETP_I2C_FW_CHECKSUM_CMD, &val); + if (rv) + return -1; + tp->elan.fw_checksum = val; + + return sizeof(*tp); +} +#endif + void elan_tp_interrupt(enum gpio_signal signal) { task_wake(TASK_ID_TOUCHPAD); |