input: touchscreen: raydium v60.0 touch driver

raydium code drop

[1] Shorten suspend/resume duration

[2] Uniform debug msgs (with prefix "Raydium" and using dev_info instead of printk)

[3] Idle mode abnormal CPU clock frequency

[4] AVC snesor support (To verify AVC sensor, the return value of rm_tch_get_gpio_sensor_select routine in rm31080a_ts.c should be changed from 0 to 1. *0 for normal dalmore sensor ; 1 for ANC sensor)

[5] Pismo support (To verify Pismo, the past platform ID of dalmore_touch_init routine in /kernel/arch/arm/mach-tegra/board-dalmore.c should be changed from RM_PLATFORM_D010 to RM_PLATFORM_P140)

[6] Reduce TCH_WAKE_LOCK_TIMEOUT from 2 secs to 500 msec

Bug 1343545

Change-Id: Ia65ecb13dc667fce937e82858321ca44f50bb733
Signed-off-by: Xiaohui Tao <xtao@nvidia.com>
Reviewed-on: http://git-master/r/255657
(cherry picked from commit ad8d07d3ce337390b34784387693b63c6f4ca7d2)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Reviewed-on: http://git-master/r/258557
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>

1 files changed, 7 insertions, 48 deletions

diff --git a/drivers/input/touchscreen/rm31080a_ctrl.c b/drivers/input/touchscreen/rm31080a_ctrl.c
index 04f9f70e9..50a70c046 100644
--- a/drivers/input/touchscreen/rm31080a_ctrl.c
+++ b/drivers/input/touchscreen/rm31080a_ctrl.c
@@ -14,9 +14,9 @@
         INCLUDED FILES
 =============================================================================*/
 #include <linux/device.h>
-#include <asm/uaccess.h>        // copy_to_user(),
+#include <asm/uaccess.h>        /* copy_to_user() */
 #include <linux/delay.h>
-#include <linux/module.h>       // Module definition
+#include <linux/module.h>       /* Module definition */
 
 #include <linux/spi/rm31080a_ts.h>
 #include <linux/spi/rm31080a_ctrl.h>
@@ -24,7 +24,7 @@
 /*=============================================================================
         GLOBAL VARIABLES DECLARATION
 =============================================================================*/
-struct rm31080a_ctrl_para g_stCtrl;
+struct rm_tch_ctrl_para g_stCtrl;
 
 /*=============================================================================
         FUNCTION DECLARATION
@@ -77,16 +77,10 @@ void rm_tch_ctrl_wait_for_scan_finish(void)
 void rm_set_repeat_times(u8 u8Times)
 {
         u8 bReg1_1Fh = 0x00;
-        u8 u8Reg = 0x00;
 
-        u8Reg = g_stCtrl.bSenseNumber - 1;
-        rm_tch_spi_byte_write(0x0A, u8Reg&0x0F);
         rm_tch_spi_byte_write(0x0E, u8Times&0x1F);
 
-        if (g_stCtrl.bfTHMode)
-                bReg1_1Fh |= FILTER_THRESHOLD_MODE;
-        else
-                bReg1_1Fh &= ~FILTER_NONTHRESHOLD_MODE;
+        bReg1_1Fh &= ~FILTER_NONTHRESHOLD_MODE;
 
         if (u8Times != REPEAT_1)
                 bReg1_1Fh |= 0x44;
@@ -104,7 +98,7 @@ void rm_set_repeat_times(u8 u8Times)
 =============================================================================*/
 void rm_tch_ctrl_init(void)
 {
-        memset(&g_stCtrl, 0, sizeof(struct rm31080a_ctrl_para));
+        memset(&g_stCtrl, 0, sizeof(struct rm_tch_ctrl_para));
 }
 
 /*=============================================================================
@@ -132,44 +126,9 @@ unsigned char rm_tch_ctrl_get_idle_mode(u8 *p)
         Output:
                         N/A
 =============================================================================*/
-void rm_tch_ctrl_get_parameter(void *arg)
+void rm_tch_ctrl_set_parameter(void *arg)
 {
-#define PARA_BASIC_LEN 4
-#define PARA_HARDWARE_LEN 28
-#define PARA_NOISE_LEN 32
-#define PARA_ALGORITHM_LEN 128
-
-        u8 Temp;
-        u8 *pPara;
-
-        pPara = (u8 *) arg;
-        Temp = pPara[PARA_BASIC_LEN + PARA_HARDWARE_LEN + PARA_NOISE_LEN + PARA_ALGORITHM_LEN + 3];
-        rm_tch_set_autoscan(Temp);
-
-        g_stCtrl.bICVersion = pPara[PARA_BASIC_LEN - 1];
-        g_stCtrl.bADCNumber = pPara[PARA_BASIC_LEN + 5];
-        g_stCtrl.bChannelNumberX = pPara[PARA_BASIC_LEN];
-        g_stCtrl.bChannelNumberY = pPara[PARA_BASIC_LEN + 1];
-        g_stCtrl.u16DataLength = (g_stCtrl.bChannelNumberX + 2 + g_stCtrl.bADCNumber) * (g_stCtrl.bChannelNumberY);
-
-        g_stCtrl.bActiveRepeatTimes[0] = pPara[PARA_BASIC_LEN + PARA_HARDWARE_LEN + 4];
-        g_stCtrl.bActiveRepeatTimes[1] = pPara[PARA_BASIC_LEN + PARA_HARDWARE_LEN + 5];
-        g_stCtrl.bIdleRepeatTimes[0] = pPara[PARA_BASIC_LEN + PARA_HARDWARE_LEN + 6];
-        g_stCtrl.bIdleRepeatTimes[1] = pPara[PARA_BASIC_LEN + PARA_HARDWARE_LEN + 7];
-        g_stCtrl.bSenseNumber = pPara[PARA_BASIC_LEN + 10];
-        g_stCtrl.bfTHMode = pPara[PARA_BASIC_LEN + PARA_HARDWARE_LEN + 10];
-        g_stCtrl.bTime2Idle = pPara[194];
-        g_stCtrl.bfPowerMode = pPara[195];
-        g_stCtrl.bDebugMessage = pPara[204];
-        g_stCtrl.bTimerTriggerScale = pPara[205];
-
-        g_stCtrl.u16ResolutionX = ((u16) pPara[PARA_BASIC_LEN + 12]) << 8 | ((u16)pPara[PARA_BASIC_LEN + 11]);
-        g_stCtrl.u16ResolutionY = ((u16) pPara[PARA_BASIC_LEN + 14]) << 8 | ((u16)pPara[PARA_BASIC_LEN + 13]);
-
-        if ((g_stCtrl.u16ResolutionX == 0) || (g_stCtrl.u16ResolutionY == 0)) {
-                g_stCtrl.u16ResolutionX = RM_INPUT_RESOLUTION_X;
-                g_stCtrl.u16ResolutionY = RM_INPUT_RESOLUTION_Y;
-        }
+        memcpy(&g_stCtrl, arg, sizeof(struct rm_tch_ctrl_para));
 }
 
 /*=============================================================================*/