Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 83a2ef9a74681002714a2564b79a85a02c3631e8

Authored by Hans Holmberg
Committed by Greg Kroah-Hartman
1 parent 85520d339d

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

commit 9cf75e9e4ddd587ac12e88e8751c358b7b27e95f upstream.

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.

Fixes: 7b8792bbdffd ("gpiolib: of: Correct error handling in of_get_named_gpiod_flags")
Signed-off-by: Hans Holmberg <hans.holmberg@intel.com>
Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Tested-by: Tyler Hall <tylerwhall@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 5 additions and 4 deletions Side-by-side Diff

drivers/gpio/gpiolib-of.c
Diff comments   View file @ 83a2ef9
... ... @@ -46,12 +46,13 @@
46 46  
47 47 ret = gc->of_xlate(gc, &gg_data->gpiospec, gg_data->flags);
48 48 if (ret < 0) {
49   - /* We've found the gpio chip, but the translation failed.
50   - * Return true to stop looking and return the translation
51   - * error via out_gpio
  49 + /* We've found a gpio chip, but the translation failed.
  50 + * Store translation error in out_gpio.
  51 + * Return false to keep looking, as more than one gpio chip
  52 + * could be registered per of-node.
52 53 */
53 54 gg_data->out_gpio = ERR_PTR(ret);
54   - return true;
  55 + return false;
55 56 }
56 57  
57 58 gg_data->out_gpio = gpiochip_get_desc(gc, ret);