Commit cd61acb7 authored by Hans Holmberg's avatar Hans Holmberg Committed by Luis Henriques

gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node

commit 9cf75e9e upstream.

The change:

7b8792bb
gpiolib: of: Correct error handling in of_get_named_gpiod_flags

assumed that only one gpio-chip is registred per of-node.
Some drivers register more than one chip per of-node, so
adjust the matching function of_gpiochip_find_and_xlate to
not stop looking for chips if a node-match is found and
the translation fails.

Fixes: 7b8792bb ("gpiolib: of: Correct error handling in of_get_named_gpiod_flags")
Signed-off-by: default avatarHans Holmberg <hans.holmberg@intel.com>
Acked-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Tested-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Tested-by: default avatarTyler Hall <tylerwhall@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent ae1bf5f5
......@@ -46,12 +46,13 @@ static int of_gpiochip_find_and_xlate(struct gpio_chip *gc, void *data)
ret = gc->of_xlate(gc, &gg_data->gpiospec, gg_data->flags);
if (ret < 0) {
/* We've found the gpio chip, but the translation failed.
* Return true to stop looking and return the translation
* error via out_gpio
/* We've found a gpio chip, but the translation failed.
* Store translation error in out_gpio.
* Return false to keep looking, as more than one gpio chip
* could be registered per of-node.
*/
gg_data->out_gpio = ERR_PTR(ret);
return true;
return false;
}
gg_data->out_gpio = gpiochip_get_desc(gc, ret);
......
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