diff options
| author | Xiaohui Tao <xtao@nvidia.com> | 2012-10-17 11:35:32 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:39:08 -0700 |
| commit | 9913af364edf43e01d55426204870bf7129e6501 (patch) | |
| tree | bcde1ea1ce40480a33e0466086fedec7b11d6752 /include/linux | |
| parent | 394e38834fde1336d13e0815f8c8127db5c73f95 (diff) | |
input: touch: raydium: updates for RM31100 chip
Raydium code drop.
Add support for the new Raydium chip;
Working for both the old chip and new one
Bug 1162178
Signed-off-by: Xiaohui Tao <xtao@nvidia.com>
Reviewed-on: http://git-master/r/145319
(cherry picked from commit df26903f2f776b20a4b70eb0a16e9cf65b2a216c)
Signed-off-by: David Jung <djung@nvidia.com>
Change-Id: Ibbb0e8dc92241753799b91fd2f37263a28404dc1
Reviewed-on: http://git-master/r/146047
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Rebase-Id: Rdb927e43c13350627e071f61f5847918311da3da
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/spi/rm31080a_ctrl.h | 4 | ||||
| -rw-r--r-- | include/linux/spi/rm31080a_ts.h | 35 |
2 files changed, 30 insertions, 9 deletions
diff --git a/include/linux/spi/rm31080a_ctrl.h b/include/linux/spi/rm31080a_ctrl.h index 1a91f27068b6..bb87a14a5415 100644 --- a/include/linux/spi/rm31080a_ctrl.h +++ b/include/linux/spi/rm31080a_ctrl.h @@ -16,6 +16,7 @@ #define RM31080_REG_80 0x80 #define RM31080_REG_F2 0xF2 #define RM31080_REG_7E 0x7E +#define RM31080_REG_7F 0x7F #define RM31080B1_REG_BANK0_00H 0x00 #define RM31080B1_REG_BANK0_01H 0x01 @@ -95,6 +96,9 @@ struct rm31080a_ctrl_para { unsigned char bNoisePipelineBase; unsigned char bTime2Idle; unsigned char bfPowerMode; + unsigned char bfIdleMessage; + unsigned char bDummyRunCycle; + #if ENABLE_FILTER_SWITCH unsigned char bReg1_09h[2]; // 0: Digital Filter 1: Analog Filter diff --git a/include/linux/spi/rm31080a_ts.h b/include/linux/spi/rm31080a_ts.h index 54b955d87f3f..4545e18264ae 100644 --- a/include/linux/spi/rm31080a_ts.h +++ b/include/linux/spi/rm31080a_ts.h @@ -3,24 +3,31 @@ #define ENABLE_RAW_DATA_QUEUE -#define ENABLE_TOUCH_RESPONSE_TEST 1 //Roger -#define ENABLE_RESOLUTION_SWITCH 1 //Alex -#define ENABLE_FILTER_SWITCH 0 //Cage -#define ENABLE_NEW_NOISE_MODE 0 //Marty -#define NOISE_SUM_CHECK 0 //Nelson +#define ENABLE_TOUCH_RESPONSE_TEST 1 //Roger +#define ENABLE_RESOLUTION_SWITCH 1 //Alex +#define ENABLE_FILTER_SWITCH 0 //Cage +#define ENABLE_NEW_NOISE_MODE 0 //Marty +#define NOISE_SUM_CHECK 0 //Nelson #define ENABLE_CALIBRATTION_BY_FIRMWARE 1 #define ENABLE_NEW_PARAMETER 1 +#define ENABLE_ST_SCAN 0 -#define ENABLE_T007B1_SETTING 1 -#define ENABLE_T007B1_STABLE_IDLE_MODE 1 +#define ENABLE_T007B1_SETTING 1 +#define ENABLE_T007B1_STABLE_IDLE_MODE 1 /* Define for T007 A6/B1 IC version ckeck */ #define T007A6 0xD0 #define T007_VERSION_B 0xB0 -#define T007B1 0xB0 -#define T007B2 0xB1 + #define T007B1 0xB0 + #define T007B2 0xB1 #define T007_VERSION_C 0xC0 +#define VERSION_A_PARAMETER_OFFSET 0x00 +#define VERSION_B_PARAMETER_OFFSET 0x01 +#define VERSION_C_PARAMETER_OFFSET 0x02 +#define PARAMETER_AMOUNT 384 +#define RM_MAX_CHANNEL_COUNT 120 + #define RM_IOCTL_REPORT_POINT 0x1001 #define RM_IOCTL_SET_HAL_PID 0x1002 #define RM_IOCTL_INIT_START 0x1003 @@ -62,6 +69,13 @@ #define RM_SELF_TEST_RESULT_FAIL 0 #define RM_SELF_TEST_RESULT_PASS 1 + +#define RM_PLATFORM_KAI_PCB 0x00 +#define RM_PLATFORM_KAI 0x01 +#define RM_PLATFORM_CARDHU 0x02 +#define RM_PLATFORM_DALMORE 0x03 +#define RM_PLATFORM_PLUTO 0x04 + #define RM_PLATFORM_K007 0x00 #define RM_PLATFORM_K107 0x01 #define RM_PLATFORM_C210 0x02 @@ -84,6 +98,9 @@ struct rm_spi_ts_platform_data { int y_size; unsigned char *config; int platform_id; + unsigned char *name_of_clock; + unsigned char *name_of_3v3; + unsigned char *name_of_1v8; }; int rm31080_spi_byte_write(unsigned char u8Addr, unsigned char u8Value); |