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

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

[Hans Holmberg]

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.

Signed-off-by: Hans Holmberg <hans.holmberg@intel.com>
---
 drivers/gpio/gpiolib-of.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 08261f2..26645a8 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -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);
-- 
1.9.1

Re: [PATCH] gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node

[Alexandre Courbot]

On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <hans.holmberg@intel.com> wrote:
> 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.
>
> Signed-off-by: Hans Holmberg <hans.holmberg@intel.com>

Acked-by: Alexandre Courbot <acourbot@nvidia.com>

Thanks!

Re: [PATCH] gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node

[Robert Jarzmik]

Alexandre Courbot <gnurou@gmail.com> writes:

> On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <hans.holmberg@intel.com> wrote:
>> 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.
>>
>> Signed-off-by: Hans Holmberg <hans.holmberg@intel.com>
>
> Acked-by: Alexandre Courbot <acourbot@nvidia.com>
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
  (on arm pxa architecture)

Cheers.

-- 
Robert

Re: [PATCH] gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node

[Tyler Hall]

On Tue, Feb 10, 2015 at 12:08 PM, Robert Jarzmik <robert.jarzmik@free.fr> wrote:
> Alexandre Courbot <gnurou@gmail.com> writes:
>
>> On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <hans.holmberg@intel.com> wrote:
>>> 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.
>>>
>>> Signed-off-by: Hans Holmberg <hans.holmberg@intel.com>
>>
>> Acked-by: Alexandre Courbot <acourbot@nvidia.com>
> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
>   (on arm pxa architecture)
Tested-by: Tyler Hall <tylerwhall@gmail.com>

With gpio-pxa (multiple chips per of node) and on arm-mvebu with
mvebu-gpio (one chip per of-node).

Re: [PATCH] gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node

[Linus Walleij]

On Tue, Feb 10, 2015 at 9:48 AM, Hans Holmberg <hans.holmberg@intel.com> wrote:

> 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.
>
> Signed-off-by: Hans Holmberg <hans.holmberg@intel.com>

OK this patch applied for stable and pushed for testing
in -next.

Yours,
Linus Walleij