diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2013-11-16 07:44:52 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-25 03:03:12 -0500 |
| commit | 53e7cac35db5941f42221314c33693e71ffa496b (patch) | |
| tree | 1df9f325363d80e37a424a3f7e37f49533b9a975 /include/linux | |
| parent | 79697ef94c48df8831a156bbb046e94215b7300d (diff) | |
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.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/gpio/driver.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index 656a27efb2c8..82eac610ce1a 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h | |||
| @@ -125,6 +125,13 @@ extern struct gpio_chip *gpiochip_find(void *data, | |||
| 125 | int gpiod_lock_as_irq(struct gpio_desc *desc); | 125 | int gpiod_lock_as_irq(struct gpio_desc *desc); |
| 126 | void gpiod_unlock_as_irq(struct gpio_desc *desc); | 126 | void gpiod_unlock_as_irq(struct gpio_desc *desc); |
| 127 | 127 | ||
| 128 | enum gpio_lookup_flags { | ||
| 129 | GPIO_ACTIVE_HIGH = (0 << 0), | ||
| 130 | GPIO_ACTIVE_LOW = (1 << 0), | ||
| 131 | GPIO_OPEN_DRAIN = (1 << 1), | ||
| 132 | GPIO_OPEN_SOURCE = (1 << 2), | ||
| 133 | }; | ||
| 134 | |||
| 128 | /** | 135 | /** |
| 129 | * Lookup table for associating GPIOs to specific devices and functions using | 136 | * Lookup table for associating GPIOs to specific devices and functions using |
| 130 | * platform data. | 137 | * platform data. |
| @@ -152,9 +159,9 @@ struct gpiod_lookup { | |||
| 152 | */ | 159 | */ |
| 153 | unsigned int idx; | 160 | unsigned int idx; |
| 154 | /* | 161 | /* |
| 155 | * mask of GPIOF_* values | 162 | * mask of GPIO_* values |
| 156 | */ | 163 | */ |
| 157 | unsigned long flags; | 164 | enum gpio_lookup_flags flags; |
| 158 | }; | 165 | }; |
| 159 | 166 | ||
| 160 | /* | 167 | /* |
