diff --git a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_config.h b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_config.h index 4086ebb168e6..d7019d45ba4e 100644 --- a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_config.h +++ b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_config.h @@ -253,7 +253,7 @@ /* * auto upgrade */ -#define FTS_AUTO_UPGRADE_EN 1 +#define FTS_AUTO_UPGRADE_EN 0 /* * auto upgrade for lcd cfg @@ -289,7 +289,7 @@ * You should rename fw to "focaltech_ts_fw_tianma", and push it into * etc/firmware or by customers */ -#define FTS_MODULE_NAME "csot" +#define FTS_MODULE_NAME "" #define FTS_MODULE2_NAME "" #define FTS_MODULE3_NAME "" diff --git a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_flash.c b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_flash.c index 19d89bd8c10c..8b36a39d18bb 100644 --- a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_flash.c +++ b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_flash.c @@ -40,7 +40,7 @@ *****************************************************************************/ #define FTS_FW_REQUEST_SUPPORT 1 /* Example: focaltech_ts_fw_tianma.bin */ -#define FTS_FW_NAME_PREX_WITH_REQUEST "focaltech_ts_fw_" +#define FTS_FW_NAME_PREX_WITH_REQUEST "" /***************************************************************************** * Global variable or extern global variabls/functions diff --git a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.c b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.c index fcf72e848cff..c66efd4ece78 100644 --- a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.c +++ b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.c @@ -1218,7 +1218,7 @@ static int fts_test_save_test_data(char *file_name, char *data_buf, int len) snprintf(filepath, FILE_NAME_LENGTH, "%s%s", FTS_OUT_FILE_PATH, file_name); FTS_INFO("save test data to %s", filepath); if (NULL == pfile) { - pfile = filp_open(filepath, O_TRUNC | O_CREAT | O_RDWR, 0664); + pfile = filp_open(filepath, O_TRUNC | O_CREAT | O_RDWR, 0666); } if (IS_ERR(pfile)) { FTS_TEST_ERROR("error occured while opening file %s.", filepath); diff --git a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.h b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.h index 82064df0f6da..1bbf8962f2e2 100644 --- a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.h +++ b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_test/focaltech_test.h @@ -53,7 +53,7 @@ #define CSV_BUFFER_LEN (1024*80*5) #define TXT_BUFFER_LEN (1024*80*5) -#define TEST_SAVE_FAIL_RESULT 0 +#define TEST_SAVE_FAIL_RESULT 1 /*----------------------------------------------------------- Test Status diff --git a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_ts_mmi.c b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_ts_mmi.c index 65c8895efe75..28a2c4190fa0 100644 --- a/drivers/input/touchscreen/focaltech_touch_v3/focaltech_ts_mmi.c +++ b/drivers/input/touchscreen/focaltech_touch_v3/focaltech_ts_mmi.c @@ -217,9 +217,15 @@ static int fts_mmi_firmware_update(struct device *dev, char *fwname) static int fts_mmi_charger_mode(struct device *dev, int mode) { struct fts_ts_data *ts_data; + int ret = 0; GET_TS_DATA(dev); - ts_data->usb_detect_flag = !!mode; + ret = fts_write_reg(FTS_REG_CHARGER_MODE_EN, mode); + if(ret < 0){ + FTS_ERROR("Failed to set charger mode\n"); + } + + FTS_INFO("Success to %s charger mode\n", mode ? "Enable" : "Disable"); return 0; }