gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
PATCH 1/1 gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
The change:
7b8792bbdffdff3abda704f89c6a45ea97afdc62
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.
--- drivers/gpio/gpiolib-of.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpio/gpiolib-of.c +5 -4
@@ -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);
Signature · 1 line
1.9.1
Quoted 5 lines · Hans Holmberg
The change:
7b8792bbdffdff3abda704f89c6a45ea97afdc62
gpiolib: of: Correct error handling inof_get_named_gpiod_flags
Quoted 7 lines
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_xlateto not stop looking for chips if a node-match is found and the translation fails.Signed-off-by Hans Holmberg <[email protected]>
Thanks!
Robert Jarzmik
Tested-byQuoted 12 lines · Alexandre Courbot
Quoted 11 lines · Hans Holmberg
The change:
7b8792bbdffdff3abda704f89c6a45ea97afdc62
gpiolib: of: Correct error handling inof_get_named_gpiod_flagsassumed 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_xlateto not stop looking for chips if a node-match is found and the translation fails.
Quoted 3 lines
Quoted 1 line
Signed-off-by Hans Holmberg <[email protected]>
(on arm pxa architecture)
Cheers.
Signature · 1 line
Robert
Tyler Hall
Tested-byQuoted 14 lines · Robert Jarzmik
Quoted 12 lines · Alexandre Courbot
Quoted 11 lines · Hans Holmberg
The change:
7b8792bbdffdff3abda704f89c6a45ea97afdc62
gpiolib: of: Correct error handling inof_get_named_gpiod_flagsassumed 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_xlateto not stop looking for chips if a node-match is found and the translation fails.
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Hans Holmberg <[email protected]>Tested-by Robert Jarzmik <[email protected]>(on arm pxa architecture)
With gpio-pxa (multiple chips per of node) and on arm-mvebu with mvebu-gpio (one chip per of-node).
Quoted 5 lines · Hans Holmberg
The change:
7b8792bbdffdff3abda704f89c6a45ea97afdc62
gpiolib: of: Correct error handling inof_get_named_gpiod_flags
Quoted 7 lines
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_xlateto not stop looking for chips if a node-match is found and the translation fails.Signed-off-by Hans Holmberg <[email protected]>
OK this patch applied for stable and pushed for testing in -next.
Yours,
Linus Walleij