path: root/include
diff options
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-01-07 12:34:11 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-02-07 09:47:02 +0100
commitef70bbe1aaa612f75360e5df5952fddec50b7ca9 (patch)
tree2f80756c83780e9ed9c67401af16022a749543c0 /include
parent25b35da7f4cce82271859f1b6eabd9f3bd41a2bb (diff)
gpio: make gpiod_direction_output take a logical value
The documentation was not clear about whether gpio_direction_output should take a logical value or the physical level on the output line, i.e. whether the ACTIVE_LOW status would be taken into account. This converts gpiod_direction_output to use the logical level and adds a new gpiod_direction_output_raw for the raw value. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include')
2 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
index a5f56a0213a7..23e364538ab5 100644
--- a/include/asm-generic/gpio.h
+++ b/include/asm-generic/gpio.h
@@ -69,7 +69,7 @@ static inline int gpio_direction_input(unsigned gpio)
static inline int gpio_direction_output(unsigned gpio, int value)
- return gpiod_direction_output(gpio_to_desc(gpio), value);
+ return gpiod_direction_output_raw(gpio_to_desc(gpio), value);
static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 4d34dbbbad4d..387994325122 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -36,6 +36,7 @@ void devm_gpiod_put(struct device *dev, struct gpio_desc *desc);
int gpiod_get_direction(const struct gpio_desc *desc);
int gpiod_direction_input(struct gpio_desc *desc);
int gpiod_direction_output(struct gpio_desc *desc, int value);
+int gpiod_direction_output_raw(struct gpio_desc *desc, int value);
/* Value get/set from non-sleeping context */
int gpiod_get_value(const struct gpio_desc *desc);
@@ -121,6 +122,12 @@ static inline int gpiod_direction_output(struct gpio_desc *desc, int value)
return -ENOSYS;
+static inline int gpiod_direction_output_raw(struct gpio_desc *desc, int value)
+ /* GPIO can never have been requested */
+ WARN_ON(1);
+ return -ENOSYS;
static inline int gpiod_get_value(const struct gpio_desc *desc)

Privacy Policy