[PATCH v2 2/2] Input: ads7846 - fix up the pendown GPIO setup on Nokia 770

[Aaro Koskinen]

Commit 767d83361aaa6 ("Input: ads7846 - Convert to use software nodes")
added gpiod set up for the IRQ in the 770 board file, then another in
the touchscreen driver for reading the pen state. This will make the probe
fail:

[    1.347381] ads7846 spi2.0: failed to request pendown GPIO
[    1.361846] ads7846: probe of spi2.0 failed with error -16

I originally tried to fix it using non-exclusive flag, but that was not
found acceptable. Instead, just use a single gpiod.

Fixes: 767d83361aaa6 ("Input: ads7846 - Convert to use software nodes")
Signed-off-by: Aaro Koskinen <aaro.koskinen@xxxxxx>
---
 arch/arm/mach-omap1/board-nokia770.c | 11 -----------
 drivers/input/touchscreen/ads7846.c  | 12 +++++++-----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index a5bf5554800f..8b8013ab4590 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -285,9 +285,6 @@ static void __init nokia770_cbus_init(void)
 static struct gpiod_lookup_table nokia770_irq_gpio_table = {
 	.dev_id = NULL,
 	.table = {
-		/* GPIO used by SPI device 1 */
-		GPIO_LOOKUP("gpio-0-15", 15, "ads7846_irq",
-			    GPIO_ACTIVE_HIGH),
 		/* GPIO used for retu IRQ */
 		GPIO_LOOKUP("gpio-48-63", 14, "retu_irq",
 			    GPIO_ACTIVE_HIGH),
@@ -307,8 +304,6 @@ static struct gpiod_lookup_table nokia770_irq_gpio_table = {
 
 static void __init omap_nokia770_init(void)
 {
-	struct gpio_desc *d;
-
 	/* On Nokia 770, the SleepX signal is masked with an
 	 * MPUIO line by default.  It has to be unmasked for it
 	 * to become functional */
@@ -322,12 +317,6 @@ static void __init omap_nokia770_init(void)
 	platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
 
 	gpiod_add_lookup_table(&nokia770_irq_gpio_table);
-	d = gpiod_get(NULL, "ads7846_irq", GPIOD_IN);
-	if (IS_ERR(d))
-		pr_err("Unable to get ADS7846 IRQ GPIO descriptor\n");
-	else
-		nokia770_spi_board_info[1].irq = gpiod_to_irq(d);
-
 	spi_register_board_info(nokia770_spi_board_info,
 				ARRAY_SIZE(nokia770_spi_board_info));
 	omap_serial_init();
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 4f8cc450e779..ca7dbd3afe29 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -1084,6 +1084,8 @@ static int ads7846_setup_pendown(struct spi_device *spi,
 			dev_err(&spi->dev, "failed to request pendown GPIO\n");
 			return PTR_ERR(ts->gpio_pendown);
 		}
+		if (!spi->irq)
+			spi->irq = gpiod_to_irq(ts->gpio_pendown);
 		if (pdata->gpio_pendown_debounce)
 			gpiod_set_debounce(ts->gpio_pendown,
 					   pdata->gpio_pendown_debounce);
@@ -1374,11 +1376,6 @@ static int ads7846_probe(struct spi_device *spi)
 	unsigned long irq_flags;
 	int err;
 
-	if (!spi->irq) {
-		dev_dbg(dev, "no IRQ?\n");
-		return -EINVAL;
-	}
-
 	/* don't exceed max specified sample rate */
 	if (spi->max_speed_hz > (125000 * SAMPLE_BITS)) {
 		dev_err(dev, "f(sample) %d KHz?\n",
@@ -1455,6 +1452,11 @@ static int ads7846_probe(struct spi_device *spi)
 	if (err)
 		return err;
 
+	if (!spi->irq) {
+		dev_dbg(dev, "no IRQ?\n");
+		return -EINVAL;
+	}
+
 	if (pdata->penirq_recheck_delay_usecs)
 		ts->penirq_recheck_delay_usecs =
 				pdata->penirq_recheck_delay_usecs;
-- 
2.39.2