gpiolib: use dedicated flags for GPIO properties
PATCH 1/1 gpiolib: use dedicated flags for GPIO properties
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.
--
The new GPIO interface documentation already uses these new declarations. It would be nice to have this merged in a 3.13-rc since it is necessary to properly declare GPIO mappings as platform data.
--- drivers/gpio/gpiolib.c | 22 +++++++++++++++------- include/linux/gpio/driver.h | 11 +++++++++-- 2 files changed, 24 insertions(+), 9 deletions(-)
drivers/gpio/gpiolib.c +15 -7
@@ -13,6 +13,7 @@#include <linux/acpi_gpio.h> #include <linux/idr.h> #include <linux/slab.h> +#include <linux/gpio/driver.h> #define CREATE_TRACE_POINTS #include <trace/events/gpio.h>
@@ -2226,7 +2227,8 @@ void gpiod_add_table(struct gpiod_lookup *table, size_t size)#ifdef CONFIG_OF 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 */ enum of_gpio_flags of_flags;
@@ -2244,7 +2246,7 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,return desc;if (of_flags &OF_GPIO_ACTIVE_LOW ) - *flags |=GPIOF_ACTIVE_LOW ; + *flags |=GPIO_ACTIVE_LOW ;return desc; }
@@ -2257,7 +2259,8 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,#endif 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 gpio_desc *desc;
@@ -2267,13 +2270,14 @@ static struct gpio_desc *acpi_find_gpio(struct device *dev, const char *con_id,return desc;if (info.gpioint && info.active_low) - *flags |=GPIOF_ACTIVE_LOW ; + *flags |=GPIO_ACTIVE_LOW ;return desc; }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 ;struct gpio_desc *desc =ERR_PTR (-ENODEV );
@@ -2365,7 +2369,7 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, {struct gpio_desc *desc;int status; -unsigned long flags =0 ; +enum gpio_lookup_flags flags =0 ;dev_dbg (dev,"GPIO lookup for consumer %s\n" , con_id);
@@ -2391,8 +2395,12 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev,if (status <0 )return ERR_PTR (status); -if (flags &GPIOF_ACTIVE_LOW ) +if (flags &GPIO_ACTIVE_LOW )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; }
include/linux/gpio/driver.h +9 -2
@@ -125,6 +125,13 @@ extern struct gpio_chip *gpiochip_find(void *data,int gpiod_lock_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 * platform data.
@@ -152,9 +159,9 @@ struct gpiod_lookup {*/ unsigned int idx;/* -* mask of GPIOF_* values +* mask of GPIO_* values */ -unsigned long flags; +enum gpio_lookup_flags flags; };/*
Signature · 1 line
1.8.4.2
Quoted 4 lines · Alexandre Courbot
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.
Quoted 8 lines
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_DRAINandGPIO_OPEN_SOURCEto be specified as GPIO mapping properties.Signed-off-by Alexandre Courbot <[email protected]>
Applied for fixes.
Yours,
Linus Walleij