adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Input: ucb1400_ts - allow passing IRQ through platfrom_data

Browse source 
This patch allows UCB1400 to get IRQ GPIO from platform data. In case
platform_data are not supplied or the IRQ supplied in the platform_data
is negative, fall back to the old IRQ detection algorithm.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Marek Vasut 2009-11-08 19:45:54 -08:00 committed by Dmitry Torokhov
parent 765af10de6
commit fb14159755
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/input/touchscreen/ucb1400_ts.c
View file

@ -355,10 +355,13 @@ static int ucb1400_ts_probe(struct platform_device *dev)
goto err; goto err;
} }
error = ucb1400_ts_detect_irq(ucb); /* Only in case the IRQ line wasn't supplied, try detecting it */
if (error) { if (ucb->irq < 0) {
printk(KERN_ERR "UCB1400: IRQ probe failed\n"); error = ucb1400_ts_detect_irq(ucb);
goto err_free_devs; if (error) {
printk(KERN_ERR "UCB1400: IRQ probe failed\n");
goto err_free_devs;
}
} }
init_waitqueue_head(&ucb->ts_wait); init_waitqueue_head(&ucb->ts_wait);

7
drivers/mfd/ucb1400_core.c
View file

@ -51,6 +51,7 @@ static int ucb1400_core_probe(struct device *dev)
struct ucb1400_ts ucb_ts; struct ucb1400_ts ucb_ts;
struct ucb1400_gpio ucb_gpio; struct ucb1400_gpio ucb_gpio;
struct snd_ac97 *ac97; struct snd_ac97 *ac97;
struct ucb1400_pdata *pdata = dev->platform_data;
memset(&ucb_ts, 0, sizeof(ucb_ts)); memset(&ucb_ts, 0, sizeof(ucb_ts));
memset(&ucb_gpio, 0, sizeof(ucb_gpio)); memset(&ucb_gpio, 0, sizeof(ucb_gpio));
@ -88,6 +89,12 @@ static int ucb1400_core_probe(struct device *dev)
/* TOUCHSCREEN */ /* TOUCHSCREEN */
ucb_ts.ac97 = ac97; ucb_ts.ac97 = ac97;
if (pdata != NULL && pdata->irq >= 0)
ucb_ts.irq = pdata->irq;
else
ucb_ts.irq = -1;
ucb->ucb1400_ts = platform_device_alloc("ucb1400_ts", -1); ucb->ucb1400_ts = platform_device_alloc("ucb1400_ts", -1);
if (!ucb->ucb1400_ts) { if (!ucb->ucb1400_ts) {
err = -ENOMEM; err = -ENOMEM;

4
include/linux/ucb1400.h
View file

@ -110,6 +110,10 @@ struct ucb1400 {
struct platform_device *ucb1400_gpio; struct platform_device *ucb1400_gpio;
}; };
struct ucb1400_pdata {
int irq;
};
static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg) static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
{ {
return ac97->bus->ops->read(ac97, reg); return ac97->bus->ops->read(ac97, reg);