korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Input: atmel_mxt_ts - read and report bootloader version

Browse Source 
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Nick Dyer 2014-05-18 23:13:40 -07:00 committed by Dmitry Torokhov
parent f28a842db6
commit e57a66aa85
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/input/touchscreen/atmel_mxt_ts.c
View File

@ -198,6 +198,8 @@
#define MXT_FRAME_CRC_PASS 0x04 #define MXT_FRAME_CRC_PASS 0x04
#define MXT_APP_CRC_FAIL 0x40 /* valid 7 8 bit only */ #define MXT_APP_CRC_FAIL 0x40 /* valid 7 8 bit only */
#define MXT_BOOT_STATUS_MASK 0x3f #define MXT_BOOT_STATUS_MASK 0x3f
#define MXT_BOOT_EXTENDED_ID (1 << 5)
#define MXT_BOOT_ID_MASK 0x1f
/* Touch status */ /* Touch status */
#define MXT_UNGRIP (1 << 0) #define MXT_UNGRIP (1 << 0)
@ -446,6 +448,27 @@ static int mxt_lookup_bootloader_address(struct mxt_data *data)
return 0; return 0;
} }
static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val)
{
struct device *dev = &data->client->dev;
u8 buf[3];
if (val & MXT_BOOT_EXTENDED_ID) {
if (mxt_bootloader_read(data, &buf[0], 3) != 0) {
dev_err(dev, "%s: i2c failure\n", __func__);
return -EIO;
}
dev_dbg(dev, "Bootloader ID:%d Version:%d\n", buf[1], buf[2]);
return buf[0];
} else {
dev_dbg(dev, "Bootloader ID:%d\n", val & MXT_BOOT_ID_MASK);
return val;
}
}
static int mxt_check_bootloader(struct mxt_data *data, unsigned int state) static int mxt_check_bootloader(struct mxt_data *data, unsigned int state)
{ {
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
@ -478,6 +501,9 @@ recheck:
if (ret) if (ret)
return ret; return ret;
if (state == MXT_WAITING_BOOTLOAD_CMD)
val = mxt_get_bootloader_version(data, val);
switch (state) { switch (state) {
case MXT_WAITING_BOOTLOAD_CMD: case MXT_WAITING_BOOTLOAD_CMD:
case MXT_WAITING_FRAME_DATA: case MXT_WAITING_FRAME_DATA: