UCB1400: Allow passing IRQ through platfrom_data
Subsystems (3)
PATCH 1/1 UCB1400: Allow passing IRQ through platfrom_data
Quoted 1 line
From
b8d3ab594008dd2714d4dedf12348d05c08a48fdMon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Sun, 8 Nov 2009 02:51:55 +0100
Subject: [PATCH] UCB1400: Allow passing IRQ through platfrom_data
This patch allows UCB1400 to get IRQ GPIO from platform data. In case platform_data are not supplied or the IRQ set in the platform_data is lower than zero, fall back to the old IRQ detection algorithm.
--- drivers/input/touchscreen/ucb1400_ts.c | 11 +++++++---- drivers/mfd/ucb1400_core.c | 7 +++++++ include/linux/ucb1400.h | 4 ++++ 3 files changed, 18 insertions(+), 4 deletions(-)
(quoted diff) +0 -0
b/drivers/input/touchscreen/ucb1400_ts.c
index 095f84b..89dcbe7 100644
drivers/input/touchscreen/ucb1400_ts.c +7 -4
@@ -355,10 +355,13 @@ static int ucb1400_ts_probe(struct platform_device *dev) goto err; } - error =ucb1400_ts_detect_irq (ucb); -if (error) { -printk (KERN_ERR "UCB1400: IRQ probe failed\n" ); - goto err_free_devs; +/* Only in case the IRQ line wasn't supplied, try detecting it */ +if (ucb->irq <0 ) { + error =ucb1400_ts_detect_irq (ucb); +if (error) { +printk (KERN_ERR "UCB1400: IRQ probe failed\n" ); + goto err_free_devs; + } }init_waitqueue_head (&ucb->ts_wait);
drivers/mfd/ucb1400_core.c +7 -0
@@ -51,6 +51,7 @@ static int ucb1400_core_probe(struct device *dev)struct ucb1400_ts ucb_ts;struct ucb1400_gpio ucb_gpio;struct snd_ac97 *ac97; +struct ucb1400_pdata *pdata = dev->platform_data;memset (&ucb_ts,0 ,sizeof (ucb_ts));memset (&ucb_gpio,0 ,sizeof (ucb_gpio));
@@ -88,6 +89,12 @@ static int ucb1400_core_probe(struct device *dev)/* TOUCHSCREEN */ 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 );if (!ucb->ucb1400_ts) { err = -ENOMEM ;
include/linux/ucb1400.h +4 -0
@@ -110,6 +110,10 @@ struct ucb1400 {struct platform_device *ucb1400_gpio; }; +struct ucb1400_pdata { +int irq; +}; +static inline u16 ucb1400_reg_read (struct snd_ac97 *ac97,u16 reg) {return ac97->bus->ops->read (ac97, reg);
Signature · 1 line
1.6.5
Dmitry Torokhov
maintainerHi Marek,
Quoted 9 lines · Marek Vasut
From
b8d3ab594008dd2714d4dedf12348d05c08a48fdMon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Sun, 8 Nov 2009 02:51:55 +0100
Subject: [PATCH] UCB1400: Allow passing IRQ throughplatfrom_dataThis patch allows UCB1400 to get IRQ GPIO from platform data. In case
platform_dataare not supplied or the IRQ set in theplatform_datais lower than zero, fall back to the old IRQ detection algorithm.
Makes sense, will apply.
Signature · 1 line
Dmitry
Dne Ne 8. listopadu 2009 06:40:05 Dmitry Torokhov napsal(a):
Quoted 8 lines
Hi Marek,
Quoted 5 lines · Marek Vasut
From
b8d3ab594008dd2714d4dedf12348d05c08a48fdMon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Sun, 8 Nov 2009 02:51:55 +0100
Subject: [PATCH] UCB1400: Allow passing IRQ throughplatfrom_data
Quoted 6 lines
Quoted 3 lines
This patch allows UCB1400 to get IRQ GPIO from platform data. In case
platform_dataare not supplied or the IRQ set in theplatform_datais lower than zero, fall back to the old IRQ detection algorithm.Makes sense, will apply.
Thanks :)
Cheers!