Commit cee451c9 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Dmitry Torokhov

Input: tsc2007 - convert to GPIO descriptors

This converts the driver to use GPIO descriptors.

Note that it now uses logical polarity and thus nagation has been dropped.
Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20210314210951.645783-1-andy.shevchenko@gmail.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ea16ef96
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#ifndef _TSC2007_H #ifndef _TSC2007_H
#define _TSC2007_H #define _TSC2007_H
struct gpio_desc;
#define TSC2007_MEASURE_TEMP0 (0x0 << 4) #define TSC2007_MEASURE_TEMP0 (0x0 << 4)
#define TSC2007_MEASURE_AUX (0x2 << 4) #define TSC2007_MEASURE_AUX (0x2 << 4)
#define TSC2007_MEASURE_TEMP1 (0x4 << 4) #define TSC2007_MEASURE_TEMP1 (0x4 << 4)
...@@ -69,7 +71,7 @@ struct tsc2007 { ...@@ -69,7 +71,7 @@ struct tsc2007 {
int fuzzy; int fuzzy;
int fuzzz; int fuzzz;
unsigned int gpio; struct gpio_desc *gpiod;
int irq; int irq;
wait_queue_head_t wait; wait_queue_head_t wait;
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/gpio/consumer.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/platform_data/tsc2007.h> #include <linux/platform_data/tsc2007.h>
#include "tsc2007.h" #include "tsc2007.h"
...@@ -226,7 +226,7 @@ static int tsc2007_get_pendown_state_gpio(struct device *dev) ...@@ -226,7 +226,7 @@ static int tsc2007_get_pendown_state_gpio(struct device *dev)
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct tsc2007 *ts = i2c_get_clientdata(client); struct tsc2007 *ts = i2c_get_clientdata(client);
return !gpio_get_value(ts->gpio); return gpiod_get_value(ts->gpiod);
} }
static int tsc2007_probe_dt(struct i2c_client *client, struct tsc2007 *ts) static int tsc2007_probe_dt(struct i2c_client *client, struct tsc2007 *ts)
...@@ -266,13 +266,14 @@ static int tsc2007_probe_dt(struct i2c_client *client, struct tsc2007 *ts) ...@@ -266,13 +266,14 @@ static int tsc2007_probe_dt(struct i2c_client *client, struct tsc2007 *ts)
return -EINVAL; return -EINVAL;
} }
ts->gpio = of_get_gpio(np, 0); ts->gpiod = devm_gpiod_get_optional(&client->dev, NULL, GPIOD_IN);
if (gpio_is_valid(ts->gpio)) if (IS_ERR(ts->gpiod))
return PTR_ERR(ts->gpiod);
if (ts->gpiod)
ts->get_pendown_state = tsc2007_get_pendown_state_gpio; ts->get_pendown_state = tsc2007_get_pendown_state_gpio;
else else
dev_warn(&client->dev, dev_warn(&client->dev, "Pen down GPIO not specified in DT\n");
"GPIO not specified in DT (of_get_gpio returned %d)\n",
ts->gpio);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment