2015-02-10 08:45:53

by Holmberg, Hans

Subject: [PATCH] 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.

Signed-off-by: Hans Holmberg <[email protected]>
---
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

2015-02-10 08:50:45

by Alexandre Courbot

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

On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <[email protected]> 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 <[email protected]>

Acked-by: Alexandre Courbot <[email protected]>

Thanks!

2015-02-10 17:08:32

by Robert Jarzmik

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

Alexandre Courbot <[email protected]> writes:

> On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <[email protected]> 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 <[email protected]>
>
> Acked-by: Alexandre Courbot <[email protected]>
Tested-by: Robert Jarzmik <[email protected]>
(on arm pxa architecture)

Cheers.

--
Robert

2015-02-10 20:31:19

by Tyler Hall

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

On Tue, Feb 10, 2015 at 12:08 PM, Robert Jarzmik <[email protected]> wrote:
> Alexandre Courbot <[email protected]> writes:
>
>> On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <[email protected]> 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 <[email protected]>
>>
>> Acked-by: Alexandre Courbot <[email protected]>
> Tested-by: Robert Jarzmik <[email protected]>
> (on arm pxa architecture)
Tested-by: Tyler Hall <[email protected]>

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

2015-02-18 17:20:13

by Linus Walleij

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

On Tue, Feb 10, 2015 at 9:48 AM, Hans Holmberg <[email protected]> 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 <[email protected]>

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

Yours,
Linus Walleij