android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: da9052_tsi.c: Fix interrupt handling

Browse Source 
Currently da9062_tsi does not probe and it fails as follows:

da9052 1-0048: Unable to determine device interrupts

Use the new da9052 irq functions and allow the driver to probe and operate
correctly.

Tested on mx53qsb board using 'evtest' tool.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: <linux-input@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Fabio Estevam
2012-10-04 01:21:30 -03:00
committed by Samuel Ortiz
parent 8bad1abd63
commit 8f520803d2
1 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/input/touchscreen/da9052_tsi.c
View File

@ -27,8 +27,6 @@ struct da9052_tsi {
struct input_dev *dev; struct input_dev *dev;
struct delayed_work ts_pen_work; struct delayed_work ts_pen_work;
struct mutex mutex; struct mutex mutex;
unsigned int irq_pendwn;
unsigned int irq_datardy;
bool stopped; bool stopped;
bool adc_on; bool adc_on;
}; };
@ -45,8 +43,8 @@ static irqreturn_t da9052_ts_pendwn_irq(int irq, void *data)
if (!tsi->stopped) { if (!tsi->stopped) {
/* Mask PEN_DOWN event and unmask TSI_READY event */ /* Mask PEN_DOWN event and unmask TSI_READY event */
disable_irq_nosync(tsi->irq_pendwn); da9052_disable_irq_nosync(tsi->da9052, DA9052_IRQ_PENDOWN);
enable_irq(tsi->irq_datardy); da9052_enable_irq(tsi->da9052, DA9052_IRQ_TSIREADY);
da9052_ts_adc_toggle(tsi, true); da9052_ts_adc_toggle(tsi, true);
@ -137,8 +135,8 @@ static void da9052_ts_pen_work(struct work_struct *work)
return; return;
/* Mask TSI_READY event and unmask PEN_DOWN event */ /* Mask TSI_READY event and unmask PEN_DOWN event */
disable_irq(tsi->irq_datardy); da9052_disable_irq(tsi->da9052, DA9052_IRQ_TSIREADY);
enable_irq(tsi->irq_pendwn); da9052_enable_irq(tsi->da9052, DA9052_IRQ_PENDOWN);
} }
} }
} }
@ -197,7 +195,7 @@ static int da9052_ts_input_open(struct input_dev *input_dev)
mb(); mb();
/* Unmask PEN_DOWN event */ /* Unmask PEN_DOWN event */
enable_irq(tsi->irq_pendwn); da9052_enable_irq(tsi->da9052, DA9052_IRQ_PENDOWN);
/* Enable Pen Detect Circuit */ /* Enable Pen Detect Circuit */
return da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG, return da9052_reg_update(tsi->da9052, DA9052_TSI_CONT_A_REG,
@ -210,11 +208,11 @@ static void da9052_ts_input_close(struct input_dev *input_dev)
tsi->stopped = true; tsi->stopped = true;
mb(); mb();
disable_irq(tsi->irq_pendwn); da9052_disable_irq(tsi->da9052, DA9052_IRQ_PENDOWN);
cancel_delayed_work_sync(&tsi->ts_pen_work); cancel_delayed_work_sync(&tsi->ts_pen_work);
if (tsi->adc_on) { if (tsi->adc_on) {
disable_irq(tsi->irq_datardy); da9052_disable_irq(tsi->da9052, DA9052_IRQ_TSIREADY);
da9052_ts_adc_toggle(tsi, false); da9052_ts_adc_toggle(tsi, false);
/* /*
@ -222,7 +220,7 @@ static void da9052_ts_input_close(struct input_dev *input_dev)
* twice and we need to enable it to keep enable/disable * twice and we need to enable it to keep enable/disable
* counter balanced. IRQ is still off though. * counter balanced. IRQ is still off though.
*/ */
enable_irq(tsi->irq_pendwn); da9052_enable_irq(tsi->da9052, DA9052_IRQ_PENDOWN);
} }
/* Disable Pen Detect Circuit */ /* Disable Pen Detect Circuit */
@ -234,21 +232,12 @@ static int __devinit da9052_ts_probe(struct platform_device *pdev)
struct da9052 *da9052; struct da9052 *da9052;
struct da9052_tsi *tsi; struct da9052_tsi *tsi;
struct input_dev *input_dev; struct input_dev *input_dev;
int irq_pendwn;
int irq_datardy;
int error; int error;
da9052 = dev_get_drvdata(pdev->dev.parent); da9052 = dev_get_drvdata(pdev->dev.parent);
if (!da9052) if (!da9052)
return -EINVAL; return -EINVAL;
irq_pendwn = platform_get_irq_byname(pdev, "PENDWN");
irq_datardy = platform_get_irq_byname(pdev, "TSIRDY");
if (irq_pendwn < 0 || irq_datardy < 0) {
dev_err(da9052->dev, "Unable to determine device interrupts\n");
return -ENXIO;
}
tsi = kzalloc(sizeof(struct da9052_tsi), GFP_KERNEL); tsi = kzalloc(sizeof(struct da9052_tsi), GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!tsi || !input_dev) { if (!tsi || !input_dev) {
@ -258,8 +247,6 @@ static int __devinit da9052_ts_probe(struct platform_device *pdev)
tsi->da9052 = da9052; tsi->da9052 = da9052;
tsi->dev = input_dev; tsi->dev = input_dev;
tsi->irq_pendwn = da9052->irq_base + irq_pendwn;
tsi->irq_datardy = da9052->irq_base + irq_datardy;
tsi->stopped = true; tsi->stopped = true;
INIT_DELAYED_WORK(&tsi->ts_pen_work, da9052_ts_pen_work); INIT_DELAYED_WORK(&tsi->ts_pen_work, da9052_ts_pen_work);
@ -287,31 +274,25 @@ static int __devinit da9052_ts_probe(struct platform_device *pdev)
/* Disable ADC */ /* Disable ADC */
da9052_ts_adc_toggle(tsi, false); da9052_ts_adc_toggle(tsi, false);
error = request_threaded_irq(tsi->irq_pendwn, error = da9052_request_irq(tsi->da9052, DA9052_IRQ_PENDOWN,
NULL, da9052_ts_pendwn_irq, "pendown-irq", da9052_ts_pendwn_irq, tsi);
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
"PENDWN", tsi);
if (error) { if (error) {
dev_err(tsi->da9052->dev, dev_err(tsi->da9052->dev,
"Failed to register PENDWN IRQ %d, error = %d\n", "Failed to register PENDWN IRQ: %d\n", error);
tsi->irq_pendwn, error);
goto err_free_mem; goto err_free_mem;
} }
error = request_threaded_irq(tsi->irq_datardy, error = da9052_request_irq(tsi->da9052, DA9052_IRQ_TSIREADY,
NULL, da9052_ts_datardy_irq, "tsiready-irq", da9052_ts_datardy_irq, tsi);
IRQF_TRIGGER_LOW | IRQF_ONESHOT,
"TSIRDY", tsi);
if (error) { if (error) {
dev_err(tsi->da9052->dev, dev_err(tsi->da9052->dev,
"Failed to register TSIRDY IRQ %d, error = %d\n", "Failed to register TSIRDY IRQ :%d\n", error);
tsi->irq_datardy, error);
goto err_free_pendwn_irq; goto err_free_pendwn_irq;
} }
/* Mask PEN_DOWN and TSI_READY events */ /* Mask PEN_DOWN and TSI_READY events */
disable_irq(tsi->irq_pendwn); da9052_disable_irq(tsi->da9052, DA9052_IRQ_PENDOWN);
disable_irq(tsi->irq_datardy); da9052_disable_irq(tsi->da9052, DA9052_IRQ_TSIREADY);
error = da9052_configure_tsi(tsi); error = da9052_configure_tsi(tsi);
if (error) if (error)
@ -326,9 +307,9 @@ static int __devinit da9052_ts_probe(struct platform_device *pdev)
return 0; return 0;
err_free_datardy_irq: err_free_datardy_irq:
free_irq(tsi->irq_datardy, tsi); da9052_free_irq(tsi->da9052, DA9052_IRQ_TSIREADY, tsi);
err_free_pendwn_irq: err_free_pendwn_irq:
free_irq(tsi->irq_pendwn, tsi); da9052_free_irq(tsi->da9052, DA9052_IRQ_PENDOWN, tsi);
err_free_mem: err_free_mem:
kfree(tsi); kfree(tsi);
input_free_device(input_dev); input_free_device(input_dev);
@ -342,8 +323,8 @@ static int __devexit da9052_ts_remove(struct platform_device *pdev)
da9052_reg_write(tsi->da9052, DA9052_LDO9_REG, 0x19); da9052_reg_write(tsi->da9052, DA9052_LDO9_REG, 0x19);
free_irq(tsi->irq_pendwn, tsi); da9052_free_irq(tsi->da9052, DA9052_IRQ_TSIREADY, tsi);
free_irq(tsi->irq_datardy, tsi); da9052_free_irq(tsi->da9052, DA9052_IRQ_PENDOWN, tsi);
input_unregister_device(tsi->dev); input_unregister_device(tsi->dev);
kfree(tsi); kfree(tsi);