Input: eeti_ts - switch to gpiod API

gpiod API allows standard way of specifying GPIO polarity and takes it into
account when reading or setting GPIO state. It also allows us to switch to
common way of obtaining GPIO descriptor and away form legacy platform data.

Reviewed-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index e13f42a180cc0501a474240215b51ce9f520b729..b55965ee43fbe850f4b29f43201fa986319ada66 100644 (file)
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -26,7 +26,6 @@
 #include <linux/smsc911x.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
-#include <linux/input/eeti_ts.h>
 #include <linux/leds.h>
 #include <linux/w1-gpio.h>
 #include <linux/sched.h>
@@ -965,9 +964,13 @@ static struct i2c_board_info raumfeld_connector_i2c_board_info __initdata = {
        .addr   = 0x48,
 };
 
-static struct eeti_ts_platform_data eeti_ts_pdata = {
-       .irq_active_high = 1,
-       .irq_gpio = GPIO_TOUCH_IRQ,
+static struct gpiod_lookup_table raumfeld_controller_gpios_table = {
+       .dev_id = "0-000a",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa",
+                           GPIO_TOUCH_IRQ, "attn", GPIO_ACTIVE_HIGH),
+               { },
+       },
 };
 
 static const struct resource raumfeld_controller_resources[] = __initconst {
@@ -983,7 +986,6 @@ static struct i2c_board_info raumfeld_controller_i2c_board_info __initdata = {
        .addr   = 0x0a,
        .resources = raumfeld_controller_resources,
        .num_resources = ARRAY_SIZE(raumfeld_controller_resources),
-       .platform_data = &eeti_ts_pdata,
 };
 
 static struct platform_device *raumfeld_common_devices[] = {
@@ -1074,6 +1076,8 @@ static void __init __maybe_unused raumfeld_controller_init(void)
        platform_device_register(&rotary_encoder_device);
 
        spi_register_board_info(ARRAY_AND_SIZE(controller_spi_devices));
+
+       gpiod_add_lookup_table(&raumfeld_controller_gpios_table);
        i2c_register_board_info(0, &raumfeld_controller_i2c_board_info, 1);
 
        ret = gpio_request(GPIO_SHUTDOWN_BATT, "battery shutdown");

diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c
index 3627c7b5f5ec85e5dd92cc418548fee436d61d54..2facad75eb6da10ac53c4c539b964a602d7f9604 100644 (file)
--- a/drivers/input/touchscreen/eeti_ts.c
+++ b/drivers/input/touchscreen/eeti_ts.c
@@ -31,8 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/timer.h>
-#include <linux/gpio.h>
-#include <linux/input/eeti_ts.h>
+#include <linux/gpio/consumer.h>
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 
@@ -47,7 +46,7 @@ MODULE_PARM_DESC(flip_y, "flip y coordinate");
 struct eeti_ts {
        struct i2c_client *client;
        struct input_dev *input;
-       int irq_gpio, irq_active_high;
+       struct gpio_desc *attn_gpio;
        bool running;
 };
 
@@ -60,11 +59,6 @@ struct eeti_ts {
 #define REPORT_BIT_HAS_PRESSURE        BIT(6)
 #define REPORT_RES_BITS(v)     (((v) >> 1) + EETI_TS_BITDEPTH)
 
-static inline int eeti_ts_irq_active(struct eeti_ts *eeti)
-{
-       return gpio_get_value_cansleep(eeti->irq_gpio) == eeti->irq_active_high;
-}
-
 static void eeti_ts_report_event(struct eeti_ts *eeti, u8 *buf)
 {
        unsigned int res;
@@ -115,7 +109,8 @@ static irqreturn_t eeti_ts_isr(int irq, void *dev_id)
                        /* Motion packet */
                        eeti_ts_report_event(eeti, buf);
                }
-       } while (eeti->running && eeti_ts_irq_active(eeti));
+       } while (eeti->running &&
+                eeti->attn_gpio && gpiod_get_value_cansleep(eeti->attn_gpio));
 
        return IRQ_HANDLED;
 }
@@ -154,7 +149,6 @@ static int eeti_ts_probe(struct i2c_client *client,
                         const struct i2c_device_id *idp)
 {
        struct device *dev = &client->dev;
-       struct eeti_ts_platform_data *pdata = dev_get_platdata(dev);
        struct eeti_ts *eeti;
        struct input_dev *input;
        int error;
@@ -191,14 +185,10 @@ static int eeti_ts_probe(struct i2c_client *client,
 
        eeti->client = client;
        eeti->input = input;
-       eeti->irq_gpio = pdata->irq_gpio;
-
-       error = devm_gpio_request_one(dev, pdata->irq_gpio, GPIOF_IN,
-                                     client->name);
-       if (error)
-               return error;
 
-       eeti->irq_active_high = pdata->irq_active_high;
+       eeti->attn_gpio = devm_gpiod_get_optional(dev, "attn", GPIOD_IN);
+       if (IS_ERR(eeti->attn_gpio))
+               return PTR_ERR(eeti->attn_gpio);
 
        i2c_set_clientdata(client, eeti);
        input_set_drvdata(input, eeti);

diff --git a/include/linux/input/eeti_ts.h b/include/linux/input/eeti_ts.h
deleted file mode 100644 (file)
index 16625d7..0000000
--- a/include/linux/input/eeti_ts.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef LINUX_INPUT_EETI_TS_H
-#define LINUX_INPUT_EETI_TS_H
-
-struct eeti_ts_platform_data {
-       int irq_gpio;
-       unsigned int irq_active_high;
-};
-
-#endif /* LINUX_INPUT_EETI_TS_H */
-