From: lw <lw@rock-chips.com>
Date: Tue, 6 Mar 2012 03:59:21 +0000 (+0800)
Subject: rk30:modify goodix touchscreen irq operation
X-Git-Tag: firefly_0821_release~9595^2~91
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f1efb534d5fda4eaeef9640e42d10db3dc868ba4;p=firefly-linux-kernel-4.4.55.git

rk30:modify goodix touchscreen irq operation
---

diff --git a/drivers/input/touchscreen/rk29_i2c_goodix.c b/drivers/input/touchscreen/rk29_i2c_goodix.c
index 16a1c1f9f3db..eb14dbb305e7 100755
--- a/drivers/input/touchscreen/rk29_i2c_goodix.c
+++ b/drivers/input/touchscreen/rk29_i2c_goodix.c
@@ -804,7 +804,7 @@ static int rk_ts_probe(struct i2c_client *client, const struct i2c_device_id *id
 		ret  = request_irq(ts->irq, rk_ts_irq_handler ,IRQ_TYPE_LEVEL_LOW,client->name, ts);
 		if (ret != 0) {
 			printk(KERN_ALERT "Cannot allocate ts INT!ERRNO:%d\n", ret);
-			gpio_free(irq_to_gpio(ts->irq));
+			gpio_free(ts->irq_pin);
 			goto err_input_register_device_failed;
 		}
 	}
@@ -1383,13 +1383,13 @@ rewrite:
 			{
 				printk(KERN_INFO"Disable TS int!\n");
 				g_enter_isp = 1;
-				disable_irq(gpio_to_irq(ts->irq));
+				disable_irq(ts->irq);
 			}
 			else if(cmd[1] == CMD_ENABLE_TP)
 			{
 				printk(KERN_INFO"Enable TS int!\n");
 				g_enter_isp = 0;
-				enable_irq(gpio_to_irq(ts->irq));
+				enable_irq(ts->irq);
 			}
 			else if(cmd[1] == CMD_READ_VER)
 			{