Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758577Ab2HHNXg (ORCPT ); Wed, 8 Aug 2012 09:23:36 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:59653 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758535Ab2HHNXV (ORCPT ); Wed, 8 Aug 2012 09:23:21 -0400 Message-ID: <50226843.4080508@gmail.com> Date: Wed, 08 Aug 2012 15:23:15 +0200 From: Daniel Mack User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 MIME-Version: 1.0 To: Arnd Bergmann CC: linux-arm-kernel@lists.infradead.org, arm@kernel.org, linux-kernel@vger.kernel.org, "v3.2+" , Haojian Zhuang Subject: Re: [PATCH 2/6] ARM: pxa remove irq_to_gpio from eeti_ts driver References: <1344430493-5304-1-git-send-email-arnd@arndb.de> <1344430493-5304-3-git-send-email-arnd@arndb.de> In-Reply-To: <1344430493-5304-3-git-send-email-arnd@arndb.de> X-Enigmail-Version: 1.4.3 Content-Type: multipart/mixed; boundary="------------070301010801090809030403" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7513 Lines: 228 This is a multi-part message in MIME format. --------------070301010801090809030403 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 08.08.2012 14:54, Arnd Bergmann wrote: > The irq_to_gpio function was removed from the pxa platform > in linux-3.2, and this driver has been broken since. > > Without this patch, building raumfeld_defconfig results in: > > drivers/input/touchscreen/eeti_ts.c: In function 'eeti_ts_irq_active': > drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration] I've sent out a slightly different version of such a patch just yesterday. It deferres mainly in the fact that it uses gpio_to_irq() and ignores the i2c_client's irq line. That way, there can't be any inconsitency. I've appended the patch again - I haven't heard back from Dmitry yet. Thanks, Daniel > Signed-off-by: Arnd Bergmann > Cc: stable@vger.kernel.org (v3.2+) > Cc: Daniel Mack > Cc: Haojian Zhuang > --- > arch/arm/mach-pxa/raumfeld.c | 1 + > drivers/input/touchscreen/eeti_ts.c | 8 +++++--- > include/linux/input/eeti_ts.h | 1 + > 3 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c > index 5905ed1..9e1c4ea 100644 > --- a/arch/arm/mach-pxa/raumfeld.c > +++ b/arch/arm/mach-pxa/raumfeld.c > @@ -953,6 +953,7 @@ static struct i2c_board_info raumfeld_connector_i2c_board_info __initdata = { > > static struct eeti_ts_platform_data eeti_ts_pdata = { > .irq_active_high = 1, > + .gpio = GPIO_TOUCH_IRQ, > }; > > static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = { > diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c > index 503c709..45dab18 100644 > --- a/drivers/input/touchscreen/eeti_ts.c > +++ b/drivers/input/touchscreen/eeti_ts.c > @@ -48,7 +48,7 @@ struct eeti_ts_priv { > struct input_dev *input; > struct work_struct work; > struct mutex mutex; > - int irq, irq_active_high; > + int irq, gpio, irq_active_high; > }; > > #define EETI_TS_BITDEPTH (11) > @@ -62,7 +62,7 @@ struct eeti_ts_priv { > > static inline int eeti_ts_irq_active(struct eeti_ts_priv *priv) > { > - return gpio_get_value(irq_to_gpio(priv->irq)) == priv->irq_active_high; > + return gpio_get_value(priv->gpio) == priv->irq_active_high; > } > > static void eeti_ts_read(struct work_struct *work) > @@ -203,8 +203,10 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, > > pdata = client->dev.platform_data; > > - if (pdata) > + if (pdata) { > + priv->gpio = pdata->gpio; > priv->irq_active_high = pdata->irq_active_high; > + } > > irq_flags = priv->irq_active_high ? > IRQF_TRIGGER_RISING : IRQF_TRIGGER_FALLING; > diff --git a/include/linux/input/eeti_ts.h b/include/linux/input/eeti_ts.h > index f875b31..3404504 100644 > --- a/include/linux/input/eeti_ts.h > +++ b/include/linux/input/eeti_ts.h > @@ -3,6 +3,7 @@ > > struct eeti_ts_platform_data { > unsigned int irq_active_high; > + unsigned int gpio; > }; > > #endif /* LINUX_INPUT_EETI_TS_H */ > --------------070301010801090809030403 Content-Type: text/x-patch; name="0001-Input-eeti_ts-pass-gpio-value-instead-of-IRQ.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Input-eeti_ts-pass-gpio-value-instead-of-IRQ.patch" >From bfb14c1a0417435ebcf5bdebbb94ae6812cb4aee Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 7 Aug 2012 17:02:59 +0200 Subject: [PATCH] Input: eeti_ts: pass gpio value instead of IRQ The EETI touchscreen asserts its IRQ line as soon as it has data in its internal buffers. The line is automatically deasserted once all data has been read via I2C. Hence, the driver has to monitor the GPIO line and cannot simply rely on the interrupt handler reception. In the current implementation of the driver, irq_to_gpio() is used to determine the GPIO number from the i2c_client's IRQ value. As irq_to_gpio() is not available on all platforms, this patch changes this and makes the driver ignore the passed in IRQ. Instead, a GPIO is added to the platform_data struct and gpio_to_irq is used to derive the IRQ from that GPIO. If this fails, bail out. The driver is only able to work in environments where the touchscreen GPIO can be mapped to an IRQ. Signed-off-by: Daniel Mack --- drivers/input/touchscreen/eeti_ts.c | 21 +++++++++++++-------- include/linux/input/eeti_ts.h | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index 503c709..908407e 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c @@ -48,7 +48,7 @@ struct eeti_ts_priv { struct input_dev *input; struct work_struct work; struct mutex mutex; - int irq, irq_active_high; + int irq_gpio, irq, irq_active_high; }; #define EETI_TS_BITDEPTH (11) @@ -62,7 +62,7 @@ struct eeti_ts_priv { static inline int eeti_ts_irq_active(struct eeti_ts_priv *priv) { - return gpio_get_value(irq_to_gpio(priv->irq)) == priv->irq_active_high; + return gpio_get_value(priv->irq_gpio) == priv->irq_active_high; } static void eeti_ts_read(struct work_struct *work) @@ -157,7 +157,7 @@ static void eeti_ts_close(struct input_dev *dev) static int __devinit eeti_ts_probe(struct i2c_client *client, const struct i2c_device_id *idp) { - struct eeti_ts_platform_data *pdata; + struct eeti_ts_platform_data *pdata = client->dev.platform_data; struct eeti_ts_priv *priv; struct input_dev *input; unsigned int irq_flags; @@ -199,9 +199,12 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, priv->client = client; priv->input = input; - priv->irq = client->irq; + priv->irq_gpio = pdata->irq_gpio; + priv->irq = gpio_to_irq(pdata->irq_gpio); - pdata = client->dev.platform_data; + err = gpio_request_one(pdata->irq_gpio, GPIOF_IN, client->name); + if (err < 0) + goto err1; if (pdata) priv->irq_active_high = pdata->irq_active_high; @@ -215,13 +218,13 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, err = input_register_device(input); if (err) - goto err1; + goto err2; err = request_irq(priv->irq, eeti_ts_isr, irq_flags, client->name, priv); if (err) { dev_err(&client->dev, "Unable to request touchscreen IRQ.\n"); - goto err2; + goto err3; } /* @@ -233,9 +236,11 @@ static int __devinit eeti_ts_probe(struct i2c_client *client, device_init_wakeup(&client->dev, 0); return 0; -err2: +err3: input_unregister_device(input); input = NULL; /* so we dont try to free it below */ +err2: + gpio_free(pdata->irq_gpio); err1: input_free_device(input); kfree(priv); diff --git a/include/linux/input/eeti_ts.h b/include/linux/input/eeti_ts.h index f875b31..16625d7 100644 --- a/include/linux/input/eeti_ts.h +++ b/include/linux/input/eeti_ts.h @@ -2,6 +2,7 @@ #define LINUX_INPUT_EETI_TS_H struct eeti_ts_platform_data { + int irq_gpio; unsigned int irq_active_high; }; -- 1.7.11.2 --------------070301010801090809030403-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/