Input: ucb1400_ts - 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 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>

Input: ucb1400_ts - 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 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>
Marek Vasut · Dmitry Torokhov
1 parent 765af10de6
Showing 3 changed files with 18 additions and 4 deletions Side-by-side Diff
drivers/input/touchscreen/ucb1400_ts.c
drivers/mfd/ucb1400_core.c
include/linux/ucb1400.h
@@ -355,10 +355,13 @@
 		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);
@@ -51,6 +51,7 @@
 	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 @@
  
 	/* 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;
@@ -110,6 +110,10 @@
 	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);
...	...	@@ -355,10 +355,13 @@
355	355	goto err;
356	356	}
357	357
358		- error = ucb1400_ts_detect_irq(ucb);
359		- if (error) {
360		- printk(KERN_ERR "UCB1400: IRQ probe failed\n");
361		- goto err_free_devs;
	358	+ /* Only in case the IRQ line wasn't supplied, try detecting it */
	359	+ if (ucb->irq < 0) {
	360	+ error = ucb1400_ts_detect_irq(ucb);
	361	+ if (error) {
	362	+ printk(KERN_ERR "UCB1400: IRQ probe failed\n");
	363	+ goto err_free_devs;
	364	+ }
362	365	}
363	366
364	367	init_waitqueue_head(&ucb->ts_wait);
...	...	@@ -51,6 +51,7 @@
51	51	struct ucb1400_ts ucb_ts;
52	52	struct ucb1400_gpio ucb_gpio;
53	53	struct snd_ac97 *ac97;
	54	+ struct ucb1400_pdata *pdata = dev->platform_data;
54	55
55	56	memset(&ucb_ts, 0, sizeof(ucb_ts));
56	57	memset(&ucb_gpio, 0, sizeof(ucb_gpio));
...	...	@@ -88,6 +89,12 @@
88	89
89	90	/* TOUCHSCREEN */
90	91	ucb_ts.ac97 = ac97;
	92	+
	93	+ if (pdata != NULL && pdata->irq >= 0)
	94	+ ucb_ts.irq = pdata->irq;
	95	+ else
	96	+ ucb_ts.irq = -1;
	97	+
91	98	ucb->ucb1400_ts = platform_device_alloc("ucb1400_ts", -1);
92	99	if (!ucb->ucb1400_ts) {
93	100	err = -ENOMEM;
...	...	@@ -110,6 +110,10 @@
110	110	struct platform_device *ucb1400_gpio;
111	111	};
112	112
	113	+struct ucb1400_pdata {
	114	+ int irq;
	115	+};
	116	+
113	117	static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
114	118	{
115	119	return ac97->bus->ops->read(ac97, reg);