rk2928: tr726: gt811_ts.c optimize(yj)

diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk.c b/arch/arm/mach-rk2928/board-rk2928-sdk.c
index 3f935e53ff55690601303406e7575d77cfac195b..2955cb69532c2f8ec3f76edaffbf5ff4057a7da9 100755 (executable)
--- a/arch/arm/mach-rk2928/board-rk2928-sdk.c
+++ b/arch/arm/mach-rk2928/board-rk2928-sdk.c
@@ -344,7 +344,7 @@ int gt811_init_platform_hw(void)
       printk("gt811_init_platform_hw gpio_request error\n");\r
       return -EIO;\r
     }\r
-    //gpio_pull_updown(TOUCH_INT_PIN, 1);\r
+    gpio_pull_updown(TOUCH_INT_PIN, 1);\r
     gpio_direction_output(TOUCH_RESET_PIN, 0);\r
     msleep(500);\r
     gpio_set_value(TOUCH_RESET_PIN,GPIO_LOW);\r
@@ -358,6 +358,7 @@ int gt811_init_platform_hw(void)
 \r
 static struct goodix_platform_data gt811_info = {\r
   .model= 811,\r
+  .rest_pin = TOUCH_RESET_PIN, \r
   .init_platform_hw= gt811_init_platform_hw,\r
 \r
 };\r

diff --git a/drivers/input/touchscreen/gt811_ts.c b/drivers/input/touchscreen/gt811_ts.c
index c2cd505c1c157eded4a821e86714bf9fffcf5509..9cdde1a009cb1a644a8946e7e19b599b5d7786dd 100755 (executable)
--- a/drivers/input/touchscreen/gt811_ts.c
+++ b/drivers/input/touchscreen/gt811_ts.c
@@ -45,12 +45,14 @@
 #include <linux/completion.h>\r
 #include <asm/uaccess.h>\r
 #include <linux/input/mt.h>\r
+#include <plat/board.h>\r
 #include <mach/iomux.h>\r
 \r
 static struct workqueue_struct *goodix_wq;\r
 static const char *s3c_ts_name = "gt811_ts";\r
 //static struct point_queue finger_list;\r
 struct i2c_client * i2c_connect_client = NULL;\r
+int reset_pin = 0;\r
 //EXPORT_SYMBOL(i2c_connect_client);\r
 static struct proc_dir_entry *goodix_proc_entry;\r
 static short  goodix_read_version(struct gt811_ts_data *ts);   \r
@@ -470,12 +472,12 @@ COORDINATE_POLL:
        {\r
                if(point_data[3]==0xF0)\r
                {\r
-                       gpio_direction_output(SHUTDOWN_PORT, 0);\r
+                       gpio_direction_output(reset_pin, 0);\r
                        msleep(1);\r
-               //      gpio_direction_input(SHUTDOWN_PORT);\r
-            gpio_set_value(SHUTDOWN_PORT,0);\r
+               //      gpio_direction_input(reset_pin);\r
+            gpio_set_value(reset_pin,0);\r
             msleep(100);\r
-            gpio_set_value(SHUTDOWN_PORT,1);\r
+            gpio_set_value(reset_pin,1);\r
             msleep(100);\r
 \r
                        goodix_init_panel(ts);\r
@@ -654,11 +656,11 @@ static int goodix_ts_power(struct gt811_ts_data * ts, int on)
                        return ret;\r
                        \r
                case 1:\r
-                       gpio_direction_output(SHUTDOWN_PORT,0);\r
+                       gpio_direction_output(reset_pin,0);\r
                        msleep(1);\r
-           gpio_set_value(SHUTDOWN_PORT,0);\r
+           gpio_set_value(reset_pin,0);\r
            msleep(100);\r
-           gpio_set_value(SHUTDOWN_PORT,1);\r
+           gpio_set_value(reset_pin,1);\r
            msleep(100);\r
                        ret = 0;\r
                        return ret;\r
@@ -690,7 +692,7 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id
        const char irq_table[2] = {IRQF_TRIGGER_FALLING,IRQF_TRIGGER_RISING};\r
        struct gt811_ts_data *ts;\r
  //   struct gt811_platform_data *811data = client->dev.platform_data;\r
-       struct gt811_platform_data *pdata;\r
+       struct goodix_platform_data *pdata;\r
        dev_info(&client->dev,"Install gt811 driver.\n");\r
        dev_info(&client->dev,"Driver Release Date:2012-02-08\n");      \r
 \r
@@ -716,7 +718,22 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id
        }\r
 \r
        i2c_connect_client = client;\r
-       \r
+       ts->client = client;\r
+       i2c_set_clientdata(client, ts);\r
+       pdata = client->dev.platform_data;\r
+\r
+       if (pdata != NULL)\r
+       {\r
+               reset_pin = pdata->rest_pin;\r
+               \r
+               if (pdata->init_platform_hw)\r
+               {\r
+                       pdata->init_platform_hw();\r
+               }\r
+\r
+       }\r
+\r
+/*     \r
        gpio_free(SHUTDOWN_PORT);\r
        ret = gpio_request(SHUTDOWN_PORT, "RESET_INT");\r
        if (ret < 0)\r
@@ -727,21 +744,21 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id
        \r
        rk29_mux_api_set(GPIO0D3_PWM_1_NAME,GPIO0D_GPIO0D3);\r
         gpio_pull_updown(SHUTDOWN_PORT, 1);            //set GPIO pull-up\r
-       \r
+*/     \r
        for(retry=0;retry <= 10; retry++)\r
        {\r
-       gpio_direction_output(SHUTDOWN_PORT,0);\r
+       gpio_direction_output(reset_pin,0);\r
        msleep(1);\r
-       //              gpio_direction_input(SHUTDOWN_PORT);//setinput means not ack so set the reset high\r
+       //              gpio_direction_input(reset_pin);//setinput means not ack so set the reset high\r
        //              msleep(100);\r
-       gpio_set_value(SHUTDOWN_PORT,1);\r
+       gpio_set_value(reset_pin,1);\r
        msleep(100);\r
-       gpio_set_value(SHUTDOWN_PORT,0);\r
+       gpio_set_value(reset_pin,0);\r
        msleep(100);\r
-       gpio_set_value(SHUTDOWN_PORT,1);\r
+       gpio_set_value(reset_pin,1);\r
        msleep(100);\r
        int val_ret = 1;\r
-       val_ret = gpio_get_value(SHUTDOWN_PORT);\r
+       val_ret = gpio_get_value(reset_pin);\r
     ret = i2c_write_bytes(client, &test_data, 1);\r
        //ret =i2c_master_reg8_recv(client, 0x00, buf, 2, 200*1000);//i2c_write_bytes(client, &test_data, 1);   //Test I2C connection.\r
        if (ret == 1)\r
@@ -756,9 +773,7 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id
        }       \r
 \r
        INIT_WORK(&ts->work, goodix_ts_work_func);              //init work_struct\r
-       ts->client = client;\r
-       i2c_set_clientdata(client, ts);\r
-       pdata = client->dev.platform_data;\r
+\r
 /////////////////////////////// UPDATE STEP 1 START/////////////////////////////////////////////////////////////////\r
 #ifdef AUTO_UPDATE_GT811               //modify by andrew\r
        msleep(20);\r
@@ -772,6 +787,7 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id
   }\r
 #endif\r
 ///////////////////////////////UPDATE STEP 1 END////////////////////////////////////////////////////////////////      \r
+/*\r
 #ifdef INT_PORT        \r
        client->irq=TS_INT;             //If not defined in client\r
        if (client->irq)\r
@@ -793,7 +809,7 @@ static int goodix_ts_probe(struct i2c_client *client, const struct i2c_device_id
        #endif  \r
        }\r
 #endif \r
-\r
+*/\r
 err_gpio_request_failed:\r
        for(retry=0; retry<3; retry++)\r
        {\r
@@ -860,14 +876,14 @@ err_gpio_request_failed:
        }\r
        ts->bad_data = 0;\r
 \r
-#ifdef INT_PORT                \r
-       ret  = request_irq(TS_INT, goodix_ts_irq_handler ,irq_table[ts->int_trigger_type],\r
+#ifdef INT_PORT        \r
+       ret  = request_irq(gpio_to_irq(client->irq), goodix_ts_irq_handler ,irq_table[ts->int_trigger_type],\r
                        client->name, ts);\r
        if (ret != 0)\r
        {\r
                dev_err(&client->dev,"Cannot allocate ts INT!ERRNO:%d\n", ret);\r
-               gpio_direction_input(INT_PORT);\r
-               gpio_free(INT_PORT);\r
+               gpio_direction_input(client->irq);\r
+               gpio_free(client->irq);\r
                goto err_init_godix_ts;\r
        }\r
        else \r
@@ -878,7 +894,7 @@ err_gpio_request_failed:
        //      disable_irq(client->irq);\r
        #endif\r
                ts->use_irq = 1;\r
-               dev_dbg(&client->dev,"Reques EIRQ %d succesd on GPIO:%d\n",TS_INT,INT_PORT);\r
+               dev_dbg(&client->dev,"Reques EIRQ %d succesd on GPIO:%d\n",client->irq,client->irq);\r
        }       \r
 #endif \r
 \r
@@ -934,10 +950,10 @@ err_init_godix_ts:
        if(ts->use_irq)\r
        {\r
                ts->use_irq = 0;\r
-               free_irq(client->irq,ts);\r
+               free_irq(gpio_to_irq(client->irq),ts);\r
        #ifdef INT_PORT \r
-               gpio_direction_input(INT_PORT);\r
-               gpio_free(INT_PORT);\r
+               gpio_direction_input(client->irq);\r
+               gpio_free(client->irq);\r
        #endif  \r
        }\r
        else \r
@@ -949,7 +965,7 @@ err_input_register_device_failed:
 err_input_dev_alloc_failed:\r
        i2c_set_clientdata(client, NULL);\r
 err_gpio_request:\r
-       gpio_free(SHUTDOWN_PORT);\r
+       gpio_free(reset_pin);\r
 err_i2c_failed:        \r
        kfree(ts);      \r
 err_alloc_data_failed:\r
@@ -982,10 +998,10 @@ static int goodix_ts_remove(struct i2c_client *client)
        if (ts && ts->use_irq) \r
        {\r
        #ifdef INT_PORT\r
-               gpio_direction_input(INT_PORT);\r
-               gpio_free(INT_PORT);\r
+               gpio_direction_input(client->irq);\r
+               gpio_free(client->irq);\r
        #endif  \r
-               free_irq(client->irq, ts);\r
+               free_irq(gpio_to_irq(client->irq), ts);\r
        }       \r
        else if(ts)\r
                hrtimer_cancel(&ts->timer);\r
@@ -1002,7 +1018,7 @@ static int goodix_ts_suspend(struct i2c_client *client, pm_message_t mesg)
 {\r
        int ret;\r
        struct gt811_ts_data *ts = i2c_get_clientdata(client);\r
-       disable_irq(client->irq);\r
+       disable_irq(gpio_to_irq(client->irq));\r
        if (ts->power) \r
        {       \r
        }\r
@@ -1018,7 +1034,7 @@ static int goodix_ts_resume(struct i2c_client *client)
                if (ret < 0)\r
                printk(KERN_ERR "goodix_ts_resume power on failed\n");\r
        }\r
-       enable_irq(client->irq);\r
+       enable_irq(gpio_to_irq(client->irq));\r
        return 0;\r
 }\r
 \r
@@ -1159,9 +1175,9 @@ static int goodix_update_write(struct file *filp, const char __user *buff, unsig
              \r
  //       i2c_pre_cmd(ts);\r
        \r
-       gpio_direction_output(SHUTDOWN_PORT, 0);\r
+       gpio_direction_output(reset_pin, 0);\r
         msleep(5);\r
-        gpio_direction_input(SHUTDOWN_PORT);\r
+        gpio_direction_input(reset_pin);\r
        msleep(20);\r
        for(retry=0; retry<3; retry++)\r
        {\r
@@ -1469,9 +1485,9 @@ static  int gt811_reset( struct gt811_ts_data *ts )
     unsigned char inbuf[3] = {0,0xff,0};\r
     //outbuf[1] = 1;\r
 \r
-    gpio_direction_output(SHUTDOWN_PORT,0);\r
+    gpio_direction_output(reset_pin,0);\r
     msleep(20);\r
-    gpio_direction_input(SHUTDOWN_PORT);\r
+    gpio_direction_input(reset_pin);\r
     msleep(100);\r
     for(retry=0;retry < 80; retry++)\r
     {\r
@@ -1492,9 +1508,9 @@ static  int gt811_reset( struct gt811_ts_data *ts )
        }\r
        else\r
        {\r
-               gpio_direction_output(SHUTDOWN_PORT,0);\r
+               gpio_direction_output(reset_pin,0);\r
                msleep(20);\r
-               gpio_direction_input(SHUTDOWN_PORT);\r
+               gpio_direction_input(reset_pin);\r
                msleep(20);\r
                dev_info(&ts->client->dev, "i2c address failed\n");\r
        }       \r
@@ -1514,9 +1530,9 @@ static  int gt811_reset2( struct gt811_ts_data *ts )
     unsigned char inbuf[3] = {0,0xff,0};\r
     //outbuf[1] = 1;\r
 \r
-    gpio_direction_output(SHUTDOWN_PORT,0);\r
+    gpio_direction_output(reset_pin,0);\r
     msleep(20);\r
-    gpio_direction_input(SHUTDOWN_PORT);\r
+    gpio_direction_input(reset_pin);\r
     msleep(100);\r
     for(retry=0;retry < 80; retry++)\r
     {\r
@@ -1757,7 +1773,7 @@ static u8  gt811_update_proc( u8 *nvram, u16 start_addr , u16 length, struct gt8
 end:\r
     GT811_SET_INT_PIN( 1 );\r
 //    gpio_free(INT_PORT);\r
-    gpio_pull_updown(INT_PORT, NULL);\r
+    gpio_pull_updown(&ts->client->irq, NULL);\r
     \r
     msleep( 500 );\r
     ret = gt811_reset2(ts);\r
@@ -1949,8 +1965,8 @@ exit_downloader:
    // mt_set_gpio_out(GPIO_CTP_EN_PIN, GPIO_OUT_ONE);\r
        // gpio_direction_output(INT_PORT,1);\r
        // msleep(1);\r
-    gpio_free(INT_PORT);\r
-    gpio_pull_updown(INT_PORT, NULL);\r
+    gpio_free(&ts->client->irq);\r
+    gpio_pull_updown(&ts->client->irq, NULL);\r
     return err;\r
 \r
 }\r

diff --git a/drivers/input/touchscreen/gt811_ts.h b/drivers/input/touchscreen/gt811_ts.h
index 7eb59a865248144e26fa4cb34a925f82cb337c62..5cc2605518927a0f8c5e313b557fe49e9c161aaa 100755 (executable)
--- a/drivers/input/touchscreen/gt811_ts.h
+++ b/drivers/input/touchscreen/gt811_ts.h
@@ -36,16 +36,20 @@
 //#define STOP_IRQ_TYPE                     // if define then   no stop irq in irq_handle   kuuga add 1202S\r
 #define REFRESH 0     //0~0x64   Scan rate = 10000/(100+REFRESH)//define resolution of the LCD\r
 \r
+#if 0\r
 #define SHUTDOWN_PORT       RK2928_PIN3_PC3 \r
-#define INT_PORT                RK2928_PIN3_PC7  \r
+#endif\r
 \r
+#define INT_PORT                  \r
 \r
+#if 0\r
 #ifdef INT_PORT\r
        #define TS_INT                  gpio_to_irq(INT_PORT)                   //Interrupt Number,EINT18(119)\r
 //     #define INT_CFG               S3C_GPIO_SFN(3)                                   //IO configer as EINT\r
 #else\r
        #define TS_INT  0\r
 #endif \r
+#endif\r
 \r
 /////////////////////////////// UPDATE STEP 5 START /////////////////////////////////////////////////////////////////\r
 #define TPD_CHIP_VERSION_C_FIRMWARE_BASE 0x5A\r