TononixOS/ubports_kernel_google_msm
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

input: atmel_mxt_ts: Add firmware upgrade support for MXT224E

Browse Source 
Add firmware upgrade support for MXT224E and also support
the new T55 object introduced with the newer firmware. Read
T38 object from touch controller after the firmware upgrade
to avoid reading/writing into old T38 address.

Change-Id: Ifc7e0b2c31badbbf5a402413e841606db4f6dc66
Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
This commit is contained in:
Mohan Pallaka
2012-07-09 14:32:28 +05:30
committed by Stephen Boyd
parent 43ee45803b
commit 480cd24b76
1 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,7 @@ enum mxt_device_state { INIT, APPMODE, BOOTLOADER };
#define MXT_PROCI_PALM_T41 41
#define MXT_PROCI_TOUCHSUPPRESSION_T42 42
#define MXT_PROCI_STYLUS_T47 47
#define MXT_PROCI_ADAPTIVETHRESHOLD_T55 55
#define MXT_PROCI_SHIELDLESS_T56 56
#define MXT_PROCG_NOISESUPPRESSION_T48 48
#define MXT_SPT_COMMSCONFIG_T18 18
@@ -228,7 +229,7 @@ enum mxt_device_state { INIT, APPMODE, BOOTLOADER };
#define MXT_BACKUP_VALUE 0x55
#define MXT_BACKUP_TIME 25 /* msec */
#define MXT224_RESET_TIME 65 /* msec */
#define MXT224E_RESET_TIME 22 /* msec */
#define MXT224E_RESET_TIME 150 /* msec */
#define MXT1386_RESET_TIME 250 /* msec */
#define MXT_RESET_TIME 250 /* msec */
#define MXT_RESET_NOCHGREAD 400 /* msec */
@@ -386,6 +387,7 @@ static bool mxt_object_readable(unsigned int type)
case MXT_SPT_USERDATA_T38:
case MXT_SPT_DIGITIZER_T43:
case MXT_SPT_CTECONFIG_T46:
case MXT_PROCI_ADAPTIVETHRESHOLD_T55:
return true;
default:
return false;
@@ -419,6 +421,7 @@ static bool mxt_object_writable(unsigned int type)
case MXT_SPT_USERDATA_T38:
case MXT_SPT_DIGITIZER_T43:
case MXT_SPT_CTECONFIG_T46:
case MXT_PROCI_ADAPTIVETHRESHOLD_T55:
return true;
default:
return false;
@@ -732,6 +735,36 @@ static int mxt_read_object(struct mxt_data *data,
return __mxt_read_reg(data->client, reg + offset, 1, val);
}
static int mxt_get_object_address(struct device *dev, u8 type)
{
struct mxt_data *data = dev_get_drvdata(dev);
u8 obj_num, obj_buf[MXT_OBJECT_SIZE];
u16 reg;
int i, error;
error = mxt_read_reg(data->client, MXT_OBJECT_NUM, &obj_num);
if (error) {
dev_err(dev, "reading number of objects failed\n");
return -EINVAL;
}
for (i = 0; i < obj_num; i++) {
reg = MXT_OBJECT_START + MXT_OBJECT_SIZE * i;
error = mxt_read_object_table(data->client,
reg, obj_buf);
if (error)
return error;
if (obj_buf[0] == type)
return obj_buf[2] << 8 | obj_buf[1];
}
/* If control reaches here, i = obj_num and object not found */
dev_err(dev, "Requested object %d not found.\n", type);
return -EINVAL;
}
static int mxt_write_object(struct mxt_data *data,
u8 type, u8 offset, u8 val)
{
@@ -1545,6 +1578,7 @@ static int mxt_load_fw(struct device *dev, const char *fn)
switch (data->info.family_id) {
case MXT224_ID:
case MXT224E_ID:
max_frame_size = MXT_SINGLE_FW_MAX_FRAME_SIZE;
break;
case MXT1386_ID:
@@ -1683,11 +1717,12 @@ static ssize_t mxt_update_fw_store(struct device *dev,
const char *buf, size_t count)
{
struct mxt_data *data = dev_get_drvdata(dev);
int error;
int error, address;
const char *fw_name;
u8 bootldr_id;
u8 cfg_version[MXT_CFG_VERSION_LEN] = {0};
/* If fw_name is set, then the existing firmware has an upgrade */
if (!data->fw_name) {
/*
@@ -1737,6 +1772,16 @@ static ssize_t mxt_update_fw_store(struct device *dev,
data->cfg_version_idx = 0;
data->update_cfg = false;
/* T38 object address might have changed, read it from
touch controller */
address = mxt_get_object_address(dev, MXT_SPT_USERDATA_T38);
if (address < 0) {
dev_err(dev, "T38 required for touch operation\n");
return -EINVAL;
}
data->t38_start_addr = address;
error = __mxt_write_reg(data->client, data->t38_start_addr,
sizeof(cfg_version), cfg_version);
if (error)