|
@@ -21,6 +21,7 @@
|
|
|
#include <linux/of.h>
|
|
|
|
|
|
struct device_node;
|
|
|
+struct gpio_desc;
|
|
|
|
|
|
/*
|
|
|
* This is Linux-specific flags. By default controllers' and Linux' mapping
|
|
@@ -47,7 +48,7 @@ static inline struct of_mm_gpio_chip *to_of_mm_gpio_chip(struct gpio_chip *gc)
|
|
|
return container_of(gc, struct of_mm_gpio_chip, gc);
|
|
|
}
|
|
|
|
|
|
-extern int of_get_named_gpio_flags(struct device_node *np,
|
|
|
+extern struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,
|
|
|
const char *list_name, int index, enum of_gpio_flags *flags);
|
|
|
|
|
|
extern int of_mm_gpiochip_add(struct device_node *np,
|
|
@@ -62,10 +63,10 @@ extern int of_gpio_simple_xlate(struct gpio_chip *gc,
|
|
|
#else /* CONFIG_OF_GPIO */
|
|
|
|
|
|
/* Drivers may not strictly depend on the GPIO support, so let them link. */
|
|
|
-static inline int of_get_named_gpio_flags(struct device_node *np,
|
|
|
+static inline struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np,
|
|
|
const char *list_name, int index, enum of_gpio_flags *flags)
|
|
|
{
|
|
|
- return -ENOSYS;
|
|
|
+ return ERR_PTR(-ENOSYS);
|
|
|
}
|
|
|
|
|
|
static inline int of_gpio_simple_xlate(struct gpio_chip *gc,
|
|
@@ -80,6 +81,18 @@ static inline void of_gpiochip_remove(struct gpio_chip *gc) { }
|
|
|
|
|
|
#endif /* CONFIG_OF_GPIO */
|
|
|
|
|
|
+static inline int of_get_named_gpio_flags(struct device_node *np,
|
|
|
+ const char *list_name, int index, enum of_gpio_flags *flags)
|
|
|
+{
|
|
|
+ struct gpio_desc *desc;
|
|
|
+ desc = of_get_named_gpiod_flags(np, list_name, index, flags);
|
|
|
+
|
|
|
+ if (IS_ERR(desc))
|
|
|
+ return PTR_ERR(desc);
|
|
|
+ else
|
|
|
+ return desc_to_gpio(desc);
|
|
|
+}
|
|
|
+
|
|
|
/**
|
|
|
* of_gpio_named_count() - Count GPIOs for a device
|
|
|
* @np: device node to count GPIOs for
|
|
@@ -117,15 +130,21 @@ static inline int of_gpio_count(struct device_node *np)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * of_get_gpio_flags() - Get a GPIO number and flags to use with GPIO API
|
|
|
+ * of_get_gpiod_flags() - Get a GPIO descriptor and flags to use with GPIO API
|
|
|
* @np: device node to get GPIO from
|
|
|
* @index: index of the GPIO
|
|
|
* @flags: a flags pointer to fill in
|
|
|
*
|
|
|
- * Returns GPIO number to use with Linux generic GPIO API, or one of the errno
|
|
|
+ * Returns GPIO descriptor to use with Linux generic GPIO API, or a errno
|
|
|
* value on the error condition. If @flags is not NULL the function also fills
|
|
|
* in flags for the GPIO.
|
|
|
*/
|
|
|
+static inline struct gpio_desc *of_get_gpiod_flags(struct device_node *np,
|
|
|
+ int index, enum of_gpio_flags *flags)
|
|
|
+{
|
|
|
+ return of_get_named_gpiod_flags(np, "gpios", index, flags);
|
|
|
+}
|
|
|
+
|
|
|
static inline int of_get_gpio_flags(struct device_node *np, int index,
|
|
|
enum of_gpio_flags *flags)
|
|
|
{
|