Hi Linus,
On Wed, Aug 21, 2019 at 10:55:03AM +0200, Linus Walleij wrote:
> This switches the TSC2007 to use a GPIO descriptor to read
> the pendown GPIO line.
>
> Cc: H. Nikolaus Schaller <hns@xxxxxxxxxxxxx>
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> drivers/input/touchscreen/tsc2007.h | 4 +++-
> drivers/input/touchscreen/tsc2007_core.c | 14 +++++++-------
> 2 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/input/touchscreen/tsc2007.h b/drivers/input/touchscreen/tsc2007.h
> index 91c60bf6dcaf..0306c38b56c7 100644
> --- a/drivers/input/touchscreen/tsc2007.h
> +++ b/drivers/input/touchscreen/tsc2007.h
> @@ -49,6 +49,8 @@
> #define READ_X (ADC_ON_12BIT | TSC2007_MEASURE_X)
> #define PWRDOWN (TSC2007_12BIT | TSC2007_POWER_OFF_IRQ_EN)
>
> +struct gpio_desc;
> +
> struct ts_event {
> u16 x;
> u16 y;
> @@ -69,7 +71,7 @@ struct tsc2007 {
> int fuzzy;
> int fuzzz;
>
> - unsigned int gpio;
> + struct gpio_desc *gpiod;
> int irq;
>
> wait_queue_head_t wait;
> diff --git a/drivers/input/touchscreen/tsc2007_core.c b/drivers/input/touchscreen/tsc2007_core.c
> index 3b80abfc1eca..5d9c6128622e 100644
> --- a/drivers/input/touchscreen/tsc2007_core.c
> +++ b/drivers/input/touchscreen/tsc2007_core.c
> @@ -23,7 +23,7 @@
> #include <linux/interrupt.h>
> #include <linux/i2c.h>
> #include <linux/of_device.h>
> -#include <linux/of_gpio.h>
> +#include <linux/gpio/consumer.h>
> #include <linux/platform_data/tsc2007.h>
> #include "tsc2007.h"
>
> @@ -226,7 +226,7 @@ static int tsc2007_get_pendown_state_gpio(struct device *dev)
> struct i2c_client *client = to_i2c_client(dev);
> struct tsc2007 *ts = i2c_get_clientdata(client);
>
> - return !gpio_get_value(ts->gpio);
> + return !gpiod_get_value(ts->gpiod);
We need to drop the negation here and make sure DTS specifies proper
polarity for GPIOs.
Thanks.
--
Dmitry
