iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

of/gpio: Add new method for getting gpios under different property names

Browse Source 
This patch adds a new routine, of_get_named_gpio_flags(), which takes the
property name as a parameter rather than assuming "gpios".

of_get_gpio_flags() is modified to call of_get_named_gpio_flags() with "gpios"
as the property parameter.

Signed-off-by: John Bonesio <bones@secretlab.ca>
[grant.likely: Tidied up whitespace and tweaked kerneldoc comments.]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
John Bonesio 2011-06-27 16:49:57 -07:00 committed by Grant Likely
parent bf859f84a1
commit a6b0919140
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/of/gpio.c
View File

@ -21,8 +21,9 @@
#include <linux/slab.h> #include <linux/slab.h>
/** /**
* of_get_gpio_flags - Get a GPIO number and flags to use with GPIO API * of_get_named_gpio_flags() - Get a GPIO number and flags to use with GPIO API
* @np: device node to get GPIO from * @np: device node to get GPIO from
* @propname: property name containing gpio specifier(s)
* @index: index of the GPIO * @index: index of the GPIO
* @flags: a flags pointer to fill in * @flags: a flags pointer to fill in
* *
@ -30,8 +31,8 @@
* value on the error condition. If @flags is not NULL the function also fills * value on the error condition. If @flags is not NULL the function also fills
* in flags for the GPIO. * in flags for the GPIO.
*/ */
int of_get_gpio_flags(struct device_node *np, int index, int of_get_named_gpio_flags(struct device_node *np, const char *propname,
enum of_gpio_flags *flags) int index, enum of_gpio_flags *flags)
{ {
int ret; int ret;
struct device_node *gpio_np; struct device_node *gpio_np;
@ -40,7 +41,7 @@ int of_get_gpio_flags(struct device_node *np, int index,
const void *gpio_spec; const void *gpio_spec;
const __be32 *gpio_cells; const __be32 *gpio_cells;
ret = of_parse_phandles_with_args(np, "gpios", "#gpio-cells", index, ret = of_parse_phandles_with_args(np, propname, "#gpio-cells", index,
&gpio_np, &gpio_spec); &gpio_np, &gpio_spec);
if (ret) { if (ret) {
pr_debug("%s: can't parse gpios property\n", __func__); pr_debug("%s: can't parse gpios property\n", __func__);
@ -79,7 +80,7 @@ err0:
pr_debug("%s exited with status %d\n", __func__, ret); pr_debug("%s exited with status %d\n", __func__, ret);
return ret; return ret;
} }
EXPORT_SYMBOL(of_get_gpio_flags); EXPORT_SYMBOL(of_get_named_gpio_flags);
/** /**
* of_gpio_count - Count GPIOs for a device * of_gpio_count - Count GPIOs for a device

42
include/linux/of_gpio.h
View File

@ -46,8 +46,9 @@ 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); return container_of(gc, struct of_mm_gpio_chip, gc);
} }
extern int of_get_gpio_flags(struct device_node *np, int index, extern int of_get_named_gpio_flags(struct device_node *np,
enum of_gpio_flags *flags); const char *list_name, int index, enum of_gpio_flags *flags);
extern unsigned int of_gpio_count(struct device_node *np); extern unsigned int of_gpio_count(struct device_node *np);
extern int of_mm_gpiochip_add(struct device_node *np, extern int of_mm_gpiochip_add(struct device_node *np,
@ -60,8 +61,8 @@ extern struct gpio_chip *of_node_to_gpiochip(struct device_node *np);
#else /* CONFIG_OF_GPIO */ #else /* CONFIG_OF_GPIO */
/* Drivers may not strictly depend on the GPIO support, so let them link. */ /* Drivers may not strictly depend on the GPIO support, so let them link. */
static inline int of_get_gpio_flags(struct device_node *np, int index, static inline int of_get_named_gpio_flags(struct device_node *np,
enum of_gpio_flags *flags) const char *list_name, int index, enum of_gpio_flags *flags)
{ {
return -ENOSYS; return -ENOSYS;
} }
@ -77,7 +78,38 @@ static inline void of_gpiochip_remove(struct gpio_chip *gc) { }
#endif /* CONFIG_OF_GPIO */ #endif /* CONFIG_OF_GPIO */
/** /**
* of_get_gpio - Get a GPIO number to use with GPIO API * of_get_gpio_flags() - Get a GPIO number 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
* value on the error condition. If @flags is not NULL the function also fills
* in flags for the GPIO.
*/
static inline int of_get_gpio_flags(struct device_node *np, int index,
enum of_gpio_flags *flags)
{
return of_get_named_gpio_flags(np, "gpios", index, flags);
}
/**
* of_get_named_gpio() - Get a GPIO number to use with GPIO API
* @np: device node to get GPIO from
* @propname: Name of property containing gpio specifier(s)
* @index: index of the GPIO
*
* Returns GPIO number to use with Linux generic GPIO API, or one of the errno
* value on the error condition.
*/
static inline int of_get_named_gpio(struct device_node *np,
const char *propname, int index)
{
return of_get_named_gpio_flags(np, propname, index, NULL);
}
/**
* of_get_gpio() - Get a GPIO number to use with GPIO API
* @np: device node to get GPIO from * @np: device node to get GPIO from
* @index: index of the GPIO * @index: index of the GPIO
* *