Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-30 16:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpio: of: Allow -gpio suffix for property names

Browse Source 
Many bindings use the -gpio suffix in property names. Support this in
addition to the -gpios suffix when requesting GPIOs using the new
descriptor-based API.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Thierry Reding 2014-04-23 17:28:09 +02:00 committed by Linus Walleij
parent 9370084e68
commit dd34c37aa3
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpio/gpiolib.c
View File

@ -2600,17 +2600,23 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
unsigned int idx, unsigned int idx,
enum gpio_lookup_flags *flags) enum gpio_lookup_flags *flags)
{ {
static const char *suffixes[] = { "gpios", "gpio" };
char prop_name[32]; /* 32 is max size of property name */ char prop_name[32]; /* 32 is max size of property name */
enum of_gpio_flags of_flags; enum of_gpio_flags of_flags;
struct gpio_desc *desc; struct gpio_desc *desc;
unsigned int i;
if (con_id) for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
snprintf(prop_name, 32, "%s-gpios", con_id); if (con_id)
else snprintf(prop_name, 32, "%s-%s", con_id, suffixes[i]);
snprintf(prop_name, 32, "gpios"); else
snprintf(prop_name, 32, "%s", suffixes[i]);
desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx, desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,
&of_flags); &of_flags);
if (!IS_ERR(desc))
break;
}
if (IS_ERR(desc)) if (IS_ERR(desc))
return desc; return desc;