Commit dd34c37a authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij

gpio: of: Allow -gpio suffix for property names

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: default avatarThierry Reding <>
Acked-by: default avatarAlexandre Courbot <>
Signed-off-by: Linus Walleij's avatarLinus Walleij <>
parent 9370084e
......@@ -2600,17 +2600,23 @@ static struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
unsigned int idx,
enum gpio_lookup_flags *flags)
static const char *suffixes[] = { "gpios", "gpio" };
char prop_name[32]; /* 32 is max size of property name */
enum of_gpio_flags of_flags;
struct gpio_desc *desc;
unsigned int i;
if (con_id)
snprintf(prop_name, 32, "%s-gpios", con_id);
snprintf(prop_name, 32, "gpios");
for (i = 0; i < ARRAY_SIZE(suffixes); i++) {
if (con_id)
snprintf(prop_name, 32, "%s-%s", con_id, suffixes[i]);
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,
if (!IS_ERR(desc))
if (IS_ERR(desc))
return desc;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment