lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpiolib: use dedicated flags for GPIO properties

Browse Source 
GPIO mapping properties were defined using the GPIOF_* flags, which are
declared in linux/gpio.h. This file is not included when using the
GPIO descriptor interface.

This patch declares the flags that can be used as GPIO mappings
properties in linux/gpio/driver.h, and uses them in gpiolib, so that no
deprecated declarations are used by the GPIO descriptor interface.

This patch also allows GPIO_OPEN_DRAIN and GPIO_OPEN_SOURCE to be
specified as GPIO mapping properties.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Alexandre Courbot
2013-11-16 21:44:52 +09:00
committed by Linus Walleij
parent 79697ef94c
commit 53e7cac35d
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpio/gpiolib.c
View File

@@ -14,6 +14,7 @@
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/gpio/driver.h>
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/gpio.h> #include <trace/events/gpio.h>
@@ -2274,7 +2275,8 @@ void gpiod_add_table(struct gpiod_lookup *table, size_t size)
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id, static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
unsigned int idx, unsigned long *flags) unsigned int idx,
enum gpio_lookup_flags *flags)
{ {
char prop_name[32]; /* 32 is max size of property name */ char prop_name[32]; /* 32 is max size of property name */
enum of_gpio_flags of_flags; enum of_gpio_flags of_flags;
@@ -2292,7 +2294,7 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
return desc; return desc;
if (of_flags & OF_GPIO_ACTIVE_LOW) if (of_flags & OF_GPIO_ACTIVE_LOW)
*flags |= GPIOF_ACTIVE_LOW; *flags |= GPIO_ACTIVE_LOW;
return desc; return desc;
} }
@@ -2305,7 +2307,8 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
#endif #endif
static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id, static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,
unsigned int idx, unsigned long *flags) unsigned int idx,
enum gpio_lookup_flags *flags)
{ {
struct acpi_gpio_info info; struct acpi_gpio_info info;
struct gpio_desc *desc; struct gpio_desc *desc;
@@ -2315,13 +2318,14 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,
return desc; return desc;
if (info.gpioint && info.active_low) if (info.gpioint && info.active_low)
*flags |= GPIOF_ACTIVE_LOW; *flags |= GPIO_ACTIVE_LOW;
return desc; return desc;
} }
static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id, static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,
unsigned int idx, unsigned long *flags) unsigned int idx,
enum gpio_lookup_flags *flags)
{ {
const char *dev_id = dev ? dev_name(dev) : NULL; const char *dev_id = dev ? dev_name(dev) : NULL;
struct gpio_desc *desc = ERR_PTR(-ENODEV); struct gpio_desc *desc = ERR_PTR(-ENODEV);
@@ -2413,7 +2417,7 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
{ {
struct gpio_desc *desc; struct gpio_desc *desc;
int status; int status;
unsigned long flags = 0; enum gpio_lookup_flags flags = 0;
dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id); dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id);
@@ -2439,8 +2443,12 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,
if (status < 0) if (status < 0)
return ERR_PTR(status); return ERR_PTR(status);
if (flags & GPIOF_ACTIVE_LOW) if (flags & GPIO_ACTIVE_LOW)
set_bit(FLAG_ACTIVE_LOW, &desc->flags); set_bit(FLAG_ACTIVE_LOW, &desc->flags);
if (flags & GPIO_OPEN_DRAIN)
set_bit(FLAG_OPEN_DRAIN, &desc->flags);
if (flags & GPIO_OPEN_SOURCE)
set_bit(FLAG_OPEN_SOURCE, &desc->flags);
return desc; return desc;
} }

11
include/linux/gpio/driver.h
View File

@@ -125,6 +125,13 @@ extern struct gpio_chip *gpiochip_find(void *data,
int gpiod_lock_as_irq(struct gpio_desc *desc); int gpiod_lock_as_irq(struct gpio_desc *desc);
void gpiod_unlock_as_irq(struct gpio_desc *desc); void gpiod_unlock_as_irq(struct gpio_desc *desc);
enum gpio_lookup_flags {
GPIO_ACTIVE_HIGH = (0 << 0),
GPIO_ACTIVE_LOW = (1 << 0),
GPIO_OPEN_DRAIN = (1 << 1),
GPIO_OPEN_SOURCE = (1 << 2),
};
/** /**
* Lookup table for associating GPIOs to specific devices and functions using * Lookup table for associating GPIOs to specific devices and functions using
* platform data. * platform data.
@@ -152,9 +159,9 @@ struct gpiod_lookup {
*/ */
unsigned int idx; unsigned int idx;
/* /*
* mask of GPIOF_* values * mask of GPIO_* values
*/ */
unsigned long flags; enum gpio_lookup_flags flags;
}; };
/* /*