DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: synaptics_i2c_rmi: Add irqflags to platform data struct to pass them to driver

Browse Source 
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Signed-off-by: Arve Hjønnevåg <arve@android.com>
This commit is contained in:
Rebecca Schultz Zavin
2009-03-29 22:10:22 -07:00
committed by Colin Cross
parent 90229d879b
commit 70abd67c1d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/touchscreen/synaptics_i2c_rmi.c
View File

@@ -266,6 +266,7 @@ static int synaptics_ts_probe(
uint16_t max_x, max_y; uint16_t max_x, max_y;
int fuzz_x, fuzz_y, fuzz_p, fuzz_w; int fuzz_x, fuzz_y, fuzz_p, fuzz_w;
struct synaptics_i2c_rmi_platform_data *pdata; struct synaptics_i2c_rmi_platform_data *pdata;
unsigned long irqflags;
int inactive_area_left; int inactive_area_left;
int inactive_area_right; int inactive_area_right;
int inactive_area_top; int inactive_area_top;
@@ -345,6 +346,7 @@ static int synaptics_ts_probe(
pdata++; pdata++;
ts->flags = pdata->flags; ts->flags = pdata->flags;
ts->sensitivity_adjust = pdata->sensitivity_adjust; ts->sensitivity_adjust = pdata->sensitivity_adjust;
irqflags = pdata->irqflags;
inactive_area_left = pdata->inactive_left; inactive_area_left = pdata->inactive_left;
inactive_area_right = pdata->inactive_right; inactive_area_right = pdata->inactive_right;
inactive_area_top = pdata->inactive_top; inactive_area_top = pdata->inactive_top;
@@ -362,6 +364,7 @@ static int synaptics_ts_probe(
fuzz_p = pdata->fuzz_p; fuzz_p = pdata->fuzz_p;
fuzz_w = pdata->fuzz_w; fuzz_w = pdata->fuzz_w;
} else { } else {
irqflags = 0;
inactive_area_left = 0; inactive_area_left = 0;
inactive_area_right = 0; inactive_area_right = 0;
inactive_area_top = 0; inactive_area_top = 0;
@@ -513,7 +516,7 @@ static int synaptics_ts_probe(
goto err_input_register_device_failed; goto err_input_register_device_failed;
} }
if (client->irq) { if (client->irq) {
ret = request_irq(client->irq, synaptics_ts_irq_handler, 0, client->name, ts); ret = request_irq(client->irq, synaptics_ts_irq_handler, irqflags, client->name, ts);
if (ret == 0) { if (ret == 0) {
ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */ ret = i2c_smbus_write_byte_data(ts->client, 0xf1, 0x01); /* enable abs int */
if (ret) if (ret)

1
include/linux/synaptics_i2c_rmi.h
View File

@@ -32,6 +32,7 @@ struct synaptics_i2c_rmi_platform_data {
/* If non-zero another array entry follows */ /* If non-zero another array entry follows */
int (*power)(int on); /* Only valid in first array entry */ int (*power)(int on); /* Only valid in first array entry */
uint32_t flags; uint32_t flags;
unsigned long irqflags;
uint32_t inactive_left; /* 0x10000 = screen width */ uint32_t inactive_left; /* 0x10000 = screen width */
uint32_t inactive_right; /* 0x10000 = screen width */ uint32_t inactive_right; /* 0x10000 = screen width */
uint32_t inactive_top; /* 0x10000 = screen height */ uint32_t inactive_top; /* 0x10000 = screen height */