From b297a90556fad5b6c2af9e1710fbe64732dbfcab Mon Sep 17 00:00:00 2001 From: Sivasankari Date: Fri, 23 Aug 2019 19:45:12 +0800 Subject: input: touchscreen: stm: Driver version 5.2.16.10 update in production test items Modification in FPI/PI initialization SPI4 setting change Signed-off-by: Sivasankari Change-Id: Id0646c576cefd1c3e444bdce27bcb2ee0ebf120a --- fts.h | 12 ++++++------ fts_lib/ftsFlash.c | 11 +++++++++++ fts_lib/ftsHardware.h | 4 ++++ fts_lib/ftsTest.c | 28 ++++++++++++++++------------ 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/fts.h b/fts.h index b0621c4..671d3cb 100644 --- a/fts.h +++ b/fts.h @@ -52,9 +52,9 @@ */ /* **** CODE CONFIGURATION **** */ #define FTS_TS_DRV_NAME "fts" /* driver name */ -#define FTS_TS_DRV_VERSION "5.2.16.9" /* driver version string +#define FTS_TS_DRV_VERSION "5.2.16.10" /* driver version string * */ -#define FTS_TS_DRV_VER 0x05021009 /* driver version u32 format */ +#define FTS_TS_DRV_VER 0x0502100A /* driver version u32 format */ /* #define DEBUG */ /* /< define to print more logs in the kernel log * and better follow the code flow */ @@ -70,16 +70,16 @@ /* If both COMPUTE_INIT_METHOD and PRE_SAVED_METHOD are not defined, * driver will be automatically configured as GOLDEN_VALUE_METHOD */ -#define COMPUTE_INIT_METHOD /* Allow to compute init data on phone during +/*#define COMPUTE_INIT_METHOD Allow to compute init data on phone during * production */ #define SKIP_PRODUCTION_TEST /* Allow to skip Production test */ -#ifndef COMPUTE_INIT_METHOD -#define PRE_SAVED_METHOD /* Pre-Saved Method used +//#ifndef COMPUTE_INIT_METHOD +/*#define PRE_SAVED_METHOD Pre-Saved Method used * during production */ -#endif +//#endif /*#define FW_H_FILE*/ /* include the FW data as header file */ #ifdef FW_H_FILE diff --git a/fts_lib/ftsFlash.c b/fts_lib/ftsFlash.c index a25e460..f57de07 100644 --- a/fts_lib/ftsFlash.c +++ b/fts_lib/ftsFlash.c @@ -294,6 +294,16 @@ int hold_m3(void) return ret; } +#ifdef ALIX + cmd[0] = 0x70; + ret = fts_writeU8UX(FTS_CMD_HW_REG_W, ADDR_SIZE_HW_REG, + ADDR_GPIO_CONFIG_REG3, cmd, 1); + if (ret < OK) { + pr_err("%s: can not set gpio config ERROR %08X\n", + __func__, ret); + return ret; + } +#else cmd[0] = 0x07; ret = fts_writeU8UX(FTS_CMD_HW_REG_W, ADDR_SIZE_HW_REG, ADDR_GPIO_CONFIG_REG2, cmd, 1); @@ -302,6 +312,7 @@ int hold_m3(void) __func__, ret); return ret; } +#endif cmd[0] = 0x30; ret = fts_writeU8UX(FTS_CMD_HW_REG_W, ADDR_SIZE_HW_REG, diff --git a/fts_lib/ftsHardware.h b/fts_lib/ftsHardware.h index 7c94cbc..7e2b6cd 100644 --- a/fts_lib/ftsHardware.h +++ b/fts_lib/ftsHardware.h @@ -305,6 +305,10 @@ * GPIO config * register */ +#define ADDR_GPIO_CONFIG_REG3 ((u64)0x000000002000003E) /* /< address of + * GPIO config + * register */ + /**@}*/ diff --git a/fts_lib/ftsTest.c b/fts_lib/ftsTest.c index a12f3cb..080bae5 100644 --- a/fts_lib/ftsTest.c +++ b/fts_lib/ftsTest.c @@ -69,8 +69,8 @@ int initTestToDo(void) #ifndef COMPUTE_INIT_METHOD tests.MutualRawAdjITO = 1; - tests.MutualRaw = 1; - tests.MutualRawMap = 0; + tests.MutualRaw = 0; + tests.MutualRawMap = 1; tests.MutualRawGap = 0; tests.MutualRawAdj = 0; tests.MutualRawAdjGap = 0; @@ -78,7 +78,7 @@ int initTestToDo(void) tests.MutualRawLP = 0; tests.MutualRawGapLP = 0; - tests.MutualRawMapLP = 0; + tests.MutualRawMapLP = 1; tests.MutualRawAdjLP = 0; tests.MutualCx1 = 0; @@ -88,8 +88,8 @@ int initTestToDo(void) tests.MutualCxTotalAdj = 0; tests.MutualCx1LP = 0; - tests.MutualCx2LP = 1; - tests.MutualCx2AdjLP = 1; + tests.MutualCx2LP = 0; + tests.MutualCx2AdjLP = 0; tests.MutualCxTotalLP = 0; tests.MutualCxTotalAdjLP = 0; @@ -106,16 +106,18 @@ int initTestToDo(void) tests.MutualKeyCxTotal = 0; #endif - tests.SelfForceRaw = 1; + tests.SelfForceRaw = 0; tests.SelfForceRawGap = 0; + tests.SelfForceRawMap = 1; - tests.SelfForceRawLP = 1; + tests.SelfForceRawLP = 0; tests.SelfForceRawGapLP = 0; + tests.SelfForceRawMapLP = 1; tests.SelfForceIx1 = 0; tests.SelfForceIx2 = 0; tests.SelfForceIx2Adj = 0; - tests.SelfForceIxTotal = 1; + tests.SelfForceIxTotal = 0; tests.SelfForceIxTotalAdj = 0; tests.SelfForceCx1 = 0; tests.SelfForceCx2 = 0; @@ -125,7 +127,7 @@ int initTestToDo(void) tests.SelfForceIx1LP = 0; tests.SelfForceIx2LP = 0; tests.SelfForceIx2AdjLP = 0; - tests.SelfForceIxTotalLP = 1; + tests.SelfForceIxTotalLP = 0; tests.SelfForceIxTotalAdjLP = 0; tests.SelfForceCx1LP = 0; tests.SelfForceCx2LP = 0; @@ -133,16 +135,18 @@ int initTestToDo(void) tests.SelfForceCxTotalLP = 0; tests.SelfForceCxTotalAdjLP = 0; - tests.SelfSenseRaw = 1; + tests.SelfSenseRaw = 0; tests.SelfSenseRawGap = 0; + tests.SelfSenseRawMap = 1; tests.SelfSenseRawLP = 0; tests.SelfSenseRawGapLP = 0; + tests.SelfSenseRawMapLP = 1; tests.SelfSenseIx1 = 0; tests.SelfSenseIx2 = 0; tests.SelfSenseIx2Adj = 0; - tests.SelfSenseIxTotal = 1; + tests.SelfSenseIxTotal = 0; tests.SelfSenseIxTotalAdj = 0; tests.SelfSenseCx1 = 0; tests.SelfSenseCx2 = 0; @@ -1767,7 +1771,7 @@ int production_test_ms_raw_lp(const char *path_limits, int stop_on_fail, /************** Mutual Sense Test **************/ pr_info("MS RAW LP DATA TEST:\n"); if (todo->MutualRawLP == 1 || todo->MutualRawGapLP == 1 || - todo->MutualRawAdjLP == 1) { + todo->MutualRawAdjLP == 1 || todo->MutualRawMapLP) { ret = setScanMode(SCAN_MODE_LOCKED, LOCKED_LP_ACTIVE); msleep(WAIT_FOR_FRESH_FRAMES); ret |= setScanMode(SCAN_MODE_ACTIVE, 0x00); -- cgit v1.2.3