Input: eeti_ts - respect interrupt set in client structure
Instead of expecting that GPIO is always interrupt source, let's use interrupt specified in I2C client. Reviewed-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
parent
6f9fab69a2
commit
2d38849989
@ -973,6 +973,7 @@ static struct eeti_ts_platform_data eeti_ts_pdata = {
|
|||||||
static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = {
|
static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = {
|
||||||
.type = "eeti_ts",
|
.type = "eeti_ts",
|
||||||
.addr = 0x0a,
|
.addr = 0x0a,
|
||||||
|
.irq = PXA_GPIO_TO_IRQ(GPIO_TOUCH_IRQ),
|
||||||
.platform_data = &eeti_ts_pdata,
|
.platform_data = &eeti_ts_pdata,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ struct eeti_ts {
|
|||||||
struct input_dev *input;
|
struct input_dev *input;
|
||||||
struct work_struct work;
|
struct work_struct work;
|
||||||
struct mutex mutex;
|
struct mutex mutex;
|
||||||
int irq_gpio, irq, irq_active_high;
|
int irq_gpio, irq_active_high;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define EETI_TS_BITDEPTH (11)
|
#define EETI_TS_BITDEPTH (11)
|
||||||
@ -128,7 +128,7 @@ static irqreturn_t eeti_ts_isr(int irq, void *dev_id)
|
|||||||
|
|
||||||
static void eeti_ts_start(struct eeti_ts *eeti)
|
static void eeti_ts_start(struct eeti_ts *eeti)
|
||||||
{
|
{
|
||||||
enable_irq(eeti->irq);
|
enable_irq(eeti->client->irq);
|
||||||
|
|
||||||
/* Read the events once to arm the IRQ */
|
/* Read the events once to arm the IRQ */
|
||||||
eeti_ts_read(&eeti->work);
|
eeti_ts_read(&eeti->work);
|
||||||
@ -136,7 +136,7 @@ static void eeti_ts_start(struct eeti_ts *eeti)
|
|||||||
|
|
||||||
static void eeti_ts_stop(struct eeti_ts *eeti)
|
static void eeti_ts_stop(struct eeti_ts *eeti)
|
||||||
{
|
{
|
||||||
disable_irq(eeti->irq);
|
disable_irq(eeti->client->irq);
|
||||||
cancel_work_sync(&eeti->work);
|
cancel_work_sync(&eeti->work);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -201,7 +201,6 @@ static int eeti_ts_probe(struct i2c_client *client,
|
|||||||
eeti->client = client;
|
eeti->client = client;
|
||||||
eeti->input = input;
|
eeti->input = input;
|
||||||
eeti->irq_gpio = pdata->irq_gpio;
|
eeti->irq_gpio = pdata->irq_gpio;
|
||||||
eeti->irq = gpio_to_irq(pdata->irq_gpio);
|
|
||||||
|
|
||||||
error = devm_gpio_request_one(dev, pdata->irq_gpio, GPIOF_IN,
|
error = devm_gpio_request_one(dev, pdata->irq_gpio, GPIOF_IN,
|
||||||
client->name);
|
client->name);
|
||||||
@ -221,7 +220,7 @@ static int eeti_ts_probe(struct i2c_client *client,
|
|||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
error = devm_request_irq(dev, eeti->irq, eeti_ts_isr, irq_flags,
|
error = devm_request_irq(dev, client->irq, eeti_ts_isr, irq_flags,
|
||||||
client->name, eeti);
|
client->name, eeti);
|
||||||
if (error) {
|
if (error) {
|
||||||
dev_err(dev, "Unable to request touchscreen IRQ: %d\n",
|
dev_err(dev, "Unable to request touchscreen IRQ: %d\n",
|
||||||
@ -252,7 +251,7 @@ static int __maybe_unused eeti_ts_suspend(struct device *dev)
|
|||||||
mutex_unlock(&input_dev->mutex);
|
mutex_unlock(&input_dev->mutex);
|
||||||
|
|
||||||
if (device_may_wakeup(&client->dev))
|
if (device_may_wakeup(&client->dev))
|
||||||
enable_irq_wake(eeti->irq);
|
enable_irq_wake(client->irq);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -264,7 +263,7 @@ static int __maybe_unused eeti_ts_resume(struct device *dev)
|
|||||||
struct input_dev *input_dev = eeti->input;
|
struct input_dev *input_dev = eeti->input;
|
||||||
|
|
||||||
if (device_may_wakeup(&client->dev))
|
if (device_may_wakeup(&client->dev))
|
||||||
disable_irq_wake(eeti->irq);
|
disable_irq_wake(client->irq);
|
||||||
|
|
||||||
mutex_lock(&input_dev->mutex);
|
mutex_lock(&input_dev->mutex);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user