This patch changes the GPIO access for the pps-gpio driver from the
integer based API to the descriptor based API. It also adds
documentation for the device tree capture-clear option and
device tree capture-clear extraction.
The change from integer based GPIO API to the descriptor based API
breaks backward compatibility for the devicetree. This is due to
the descriptor based API appending "-gpio" or "-gpios" (see
Documentation/gpio/base.txt.)
Signed-off-by: Tom Burkart <t...@aussec.com>
---
drivers/pps/clients/pps-gpio.c | 33 +++++++++++----------------------
include/linux/pps-gpio.h | 2 +-
2 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c
index 333ad7d5b45b..d25710883794 100644
--- a/drivers/pps/clients/pps-gpio.c
+++ b/drivers/pps/clients/pps-gpio.c
@@ -31,7 +31,7 @@
#include <linux/slab.h>
#include <linux/pps_kernel.h>
#include <linux/pps-gpio.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/list.h>
#include <linux/of_device.h>
#include <linux/of_gpio.h>
@@ -41,9 +41,9 @@ struct pps_gpio_device_data {
int irq; /* IRQ used as PPS source */
struct pps_device *pps; /* PPS source device */
struct pps_source_info info; /* PPS source information */
+ struct gpio_desc *gpio_pin; /* GPIO port descriptors */
bool assert_falling_edge;
bool capture_clear;
- unsigned int gpio_pin;
};
/*
@@ -61,7 +61,7 @@ static irqreturn_t pps_gpio_irq_handler(int irq, void *data)
info = data;
- rising_edge = gpio_get_value(info->gpio_pin);
+ rising_edge = gpiod_get_value(info->gpio_pin);
if ((rising_edge && !info->assert_falling_edge) ||
(!rising_edge && info->assert_falling_edge))
pps_event(info->pps, &ts, PPS_CAPTUREASSERT, NULL);
@@ -109,34 +109,23 @@ static int pps_gpio_probe(struct platform_device *pdev)
data->assert_falling_edge = pdata->assert_falling_edge;
data->capture_clear = pdata->capture_clear;
} else {
- ret = of_get_gpio(np, 0);
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to get GPIO from device
tree\n");
- return ret;
+ /* GPIO setup */
+ data->gpio_pin = devm_gpiod_get(&pdev->dev, "pps", GPIOD_IN);
+ if (IS_ERR(data->gpio_pin)) {
+ dev_err(&pdev->dev, "failed to request PPS GPIO\n");
+ return PTR_ERR(data->gpio_pin);
}
- data->gpio_pin = ret;
gpio_label = PPS_GPIO_NAME;
if (of_get_property(np, "assert-falling-edge", NULL))
data->assert_falling_edge = true;
- }
-
- /* GPIO setup */
- ret = devm_gpio_request(&pdev->dev, data->gpio_pin, gpio_label);
- if (ret) {
- dev_err(&pdev->dev, "failed to request GPIO %u\n",
- data->gpio_pin);
- return ret;
- }
- ret = gpio_direction_input(data->gpio_pin);
- if (ret) {
- dev_err(&pdev->dev, "failed to set pin direction\n");
- return -EINVAL;
+ if (of_get_property(np, "capture-clear", NULL))
+ data->capture_clear = true;
}
/* IRQ setup */
- ret = gpio_to_irq(data->gpio_pin);
+ ret = gpiod_to_irq(data->gpio_pin);
if (ret < 0) {
dev_err(&pdev->dev, "failed to map GPIO to IRQ: %d\n", ret);
return -EINVAL;
diff --git a/include/linux/pps-gpio.h b/include/linux/pps-gpio.h
index 56f35dd3d01d..671a029fc80b 100644
--- a/include/linux/pps-gpio.h
+++ b/include/linux/pps-gpio.h
@@ -23,9 +23,9 @@
#define _PPS_GPIO_H
struct pps_gpio_platform_data {
+ struct gpio_desc *gpio_pin;
bool assert_falling_edge;
bool capture_clear;
- unsigned int gpio_pin;
const char *gpio_label;
};
--
2.12.3
