projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a4e470f
)
rk30:modify goodix touchscreen irq operation
author
lw
<lw@rock-chips.com>
Tue, 6 Mar 2012 03:59:21 +0000
(11:59 +0800)
committer
lw
<lw@rock-chips.com>
Tue, 6 Mar 2012 03:59:21 +0000
(11:59 +0800)
drivers/input/touchscreen/rk29_i2c_goodix.c
patch
|
blob
|
history
diff --git
a/drivers/input/touchscreen/rk29_i2c_goodix.c
b/drivers/input/touchscreen/rk29_i2c_goodix.c
index 16a1c1f9f3dbac5ce5c7c6071e9f9431e8229776..eb14dbb305e7481608bf3fb67d0ad6af86087200 100755
(executable)
--- 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);
\r
if (ret != 0) {
\r
printk(KERN_ALERT "Cannot allocate ts INT!ERRNO:%d\n", ret);
\r
ret = request_irq(ts->irq, rk_ts_irq_handler ,IRQ_TYPE_LEVEL_LOW,client->name, ts);
\r
if (ret != 0) {
\r
printk(KERN_ALERT "Cannot allocate ts INT!ERRNO:%d\n", ret);
\r
- gpio_free(
irq_to_gpio(ts->irq)
);
\r
+ gpio_free(
ts->irq_pin
);
\r
goto err_input_register_device_failed;
\r
}
\r
}
\r
goto err_input_register_device_failed;
\r
}
\r
}
\r
@@
-1383,13
+1383,13
@@
rewrite:
{
\r
printk(KERN_INFO"Disable TS int!\n");
\r
g_enter_isp = 1;
\r
{
\r
printk(KERN_INFO"Disable TS int!\n");
\r
g_enter_isp = 1;
\r
- disable_irq(
gpio_to_irq(ts->irq)
);
\r
+ disable_irq(
ts->irq
);
\r
}
\r
else if(cmd[1] == CMD_ENABLE_TP)
\r
{
\r
printk(KERN_INFO"Enable TS int!\n");
\r
g_enter_isp = 0;
\r
}
\r
else if(cmd[1] == CMD_ENABLE_TP)
\r
{
\r
printk(KERN_INFO"Enable TS int!\n");
\r
g_enter_isp = 0;
\r
- enable_irq(
gpio_to_irq(ts->irq)
);
\r
+ enable_irq(
ts->irq
);
\r
}
\r
else if(cmd[1] == CMD_READ_VER)
\r
{
\r
}
\r
else if(cmd[1] == CMD_READ_VER)
\r
{
\r