rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

Merge "input: touchscreen: change the focaltech firmware upgrade method"

Browse Source
This commit is contained in:
Linux Build Service Account
2014-03-28 08:18:35 -07:00
committed by Gerrit - the friendly Code Review server
parent 217336cad0 7674c5911b
commit 164f4b8f32
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/input/touchscreen/ft5x06_ts.c
+10 -13
View File
@@ -3,7 +3,7 @@
* FocalTech ft5x06 TouchScreen driver.
*
* Copyright (c) 2010 Focal tech Ltd.
* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -69,7 +69,6 @@
#define FT_REG_THGROUP 0x80
#define FT_REG_ECC 0xCC
#define FT_REG_RESET_FW 0x07
#define FT_REG_FW_MAJ_VER 0xB1
#define FT_REG_FW_MIN_VER 0xB2
#define FT_REG_FW_SUB_MIN_VER 0xB3
@@ -289,7 +288,7 @@ static void ft5x06_update_fw_ver(struct ft5x06_ts_data *data)
u8 reg_addr;
int err;
reg_addr = FT_REG_FW_MAJ_VER;
reg_addr = FT_REG_FW_VER;
err = ft5x06_i2c_read(client, &reg_addr, 1, &data->fw_ver[0], 1);
if (err < 0)
dev_err(&client->dev, "fw major version read failed");
@@ -877,6 +876,11 @@ static int ft5x06_fw_upgrade(struct device *dev, bool force)
u8 fw_file_maj, fw_file_min, fw_file_sub_min;
bool fw_upgrade = false;
if (data->suspended) {
dev_info(dev, "Device is in suspend state: Exit FW upgrade\n");
return -EBUSY;
}
rc = request_firmware(&fw, data->fw_name, dev);
if (rc < 0) {
dev_err(dev, "Request firmware failed - %s (%d)\n",
@@ -899,17 +903,10 @@ static int ft5x06_fw_upgrade(struct device *dev, bool force)
dev_info(dev, "New firmware: %d.%d.%d", fw_file_maj,
fw_file_min, fw_file_sub_min);
if (force) {
if (force)
fw_upgrade = true;
else if (data->fw_ver[0] < fw_file_maj)
fw_upgrade = true;
} else if (data->fw_ver[0] == fw_file_maj) {
if (data->fw_ver[1] < fw_file_min)
fw_upgrade = true;
else if (data->fw_ver[2] < fw_file_sub_min)
fw_upgrade = true;
else
dev_info(dev, "No need to upgrade\n");
} else
dev_info(dev, "Firmware versions do not match\n");
if (!fw_upgrade) {
dev_info(dev, "Exiting fw upgrade...\n");