2018-03-01 10:36:51

by Bartosz Golaszewski

[permalink] [raw]
Subject: [PATCH v2] ARM: davinci: fix the GPIO lookup for omapl138-hawk

From: Bartosz Golaszewski <[email protected]>

The GPIO chip is called davinci_gpio.0 in legacy mode. Fix it, so that
mmc can correctly lookup the wp and cp gpios.

Fixes: c69f43fb4f26 ("ARM: davinci: hawk: use gpio descriptor for mmc pins")
Signed-off-by: Bartosz Golaszewski <[email protected]>
---
v1 -> v2:
- added the Fixes: tag

arch/arm/mach-davinci/board-omapl138-hawk.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index a3e78074be70..62eb7d668890 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -127,8 +127,8 @@ static struct gpiod_lookup_table mmc_gpios_table = {
.dev_id = "da830-mmc.0",
.table = {
/* CD: gpio3_12: gpio60: chip 1 contains gpio range 32-63*/
- GPIO_LOOKUP("davinci_gpio.1", 28, "cd", GPIO_ACTIVE_LOW),
- GPIO_LOOKUP("davinci_gpio.1", 29, "wp", GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP("davinci_gpio.0", 28, "cd", GPIO_ACTIVE_LOW),
+ GPIO_LOOKUP("davinci_gpio.0", 29, "wp", GPIO_ACTIVE_LOW),
},
};

--
2.16.1



2018-03-09 10:21:16

by Sekhar Nori

[permalink] [raw]
Subject: Re: [PATCH v2] ARM: davinci: fix the GPIO lookup for omapl138-hawk

On Thursday 01 March 2018 04:04 PM, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[email protected]>
>
> The GPIO chip is called davinci_gpio.0 in legacy mode. Fix it, so that
> mmc can correctly lookup the wp and cp gpios.
>
> Fixes: c69f43fb4f26 ("ARM: davinci: hawk: use gpio descriptor for mmc pins")
> Signed-off-by: Bartosz Golaszewski <[email protected]>

Applied for v4.16 with a note on the fact that the gpio-davinci
driver sets the chip label to davinci_gpio.0.

Thanks,
Sekhar

---8<---
ARM: davinci: fix the GPIO lookup for omapl138-hawk

The GPIO chip is called davinci_gpio.0 in legacy mode. Fix it, so that
mmc can correctly lookup the wp and cp gpios.

Note that it is the gpio-davinci driver that sets the gpiochip label to
davinci_gpio.0.

Fixes: c69f43fb4f26 ("ARM: davinci: hawk: use gpio descriptor for mmc pins")
Signed-off-by: Bartosz Golaszewski <[email protected]>
[[email protected]: add a note on where the chip label is set]
Signed-off-by: Sekhar Nori <[email protected]>

2018-03-15 16:36:36

by David Lechner

[permalink] [raw]
Subject: Re: [v2] ARM: davinci: fix the GPIO lookup for omapl138-hawk

On 03/01/2018 04:34 AM, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <[email protected]>
>
> The GPIO chip is called davinci_gpio.0 in legacy mode. Fix it, so that
> mmc can correctly lookup the wp and cp gpios.
>
> Fixes: c69f43fb4f26 ("ARM: davinci: hawk: use gpio descriptor for mmc pins")
> Signed-off-by: Bartosz Golaszewski <[email protected]>
> Signed-off-by: Bartosz Golaszewski <[email protected]>
> Signed-off-by: Sekhar Nori <[email protected]>
> ---
> v1 -> v2:
> - added the Fixes: tag
>
> arch/arm/mach-davinci/board-omapl138-hawk.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
> index a3e78074be70..62eb7d668890 100644
> --- a/arch/arm/mach-davinci/board-omapl138-hawk.c
> +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
> @@ -127,8 +127,8 @@ static struct gpiod_lookup_table mmc_gpios_table = {
> .dev_id = "da830-mmc.0",
> .table = {
> /* CD: gpio3_12: gpio60: chip 1 contains gpio range 32-63*/
> - GPIO_LOOKUP("davinci_gpio.1", 28, "cd", GPIO_ACTIVE_LOW),
> - GPIO_LOOKUP("davinci_gpio.1", 29, "wp", GPIO_ACTIVE_LOW),
> + GPIO_LOOKUP("davinci_gpio.0", 28, "cd", GPIO_ACTIVE_LOW),
> + GPIO_LOOKUP("davinci_gpio.0", 29, "wp", GPIO_ACTIVE_LOW),
> },
> };
>
>

Does board-da830-evm.c need the same fix? It also uses "davinci_gpio.1".

2018-03-16 15:10:56

by Sekhar Nori

[permalink] [raw]
Subject: Re: [v2] ARM: davinci: fix the GPIO lookup for omapl138-hawk

On Thursday 15 March 2018 10:05 PM, David Lechner wrote:
> On 03/01/2018 04:34 AM, Bartosz Golaszewski wrote:
>> From: Bartosz Golaszewski <[email protected]>
>>
>> The GPIO chip is called davinci_gpio.0 in legacy mode. Fix it, so that
>> mmc can correctly lookup the wp and cp gpios.
>>
>> Fixes: c69f43fb4f26 ("ARM: davinci: hawk: use gpio descriptor for mmc
>> pins")
>> Signed-off-by: Bartosz Golaszewski <[email protected]>
>> Signed-off-by: Bartosz Golaszewski <[email protected]>
>> Signed-off-by: Sekhar Nori <[email protected]>
>> ---
>> v1 -> v2:
>> - added the Fixes: tag
>>
>>   arch/arm/mach-davinci/board-omapl138-hawk.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c
>> b/arch/arm/mach-davinci/board-omapl138-hawk.c
>> index a3e78074be70..62eb7d668890 100644
>> --- a/arch/arm/mach-davinci/board-omapl138-hawk.c
>> +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
>> @@ -127,8 +127,8 @@ static struct gpiod_lookup_table mmc_gpios_table = {
>>       .dev_id = "da830-mmc.0",
>>       .table = {
>>           /* CD: gpio3_12: gpio60: chip 1 contains gpio range 32-63*/
>> -        GPIO_LOOKUP("davinci_gpio.1", 28, "cd", GPIO_ACTIVE_LOW),
>> -        GPIO_LOOKUP("davinci_gpio.1", 29, "wp", GPIO_ACTIVE_LOW),
>> +        GPIO_LOOKUP("davinci_gpio.0", 28, "cd", GPIO_ACTIVE_LOW),
>> +        GPIO_LOOKUP("davinci_gpio.0", 29, "wp", GPIO_ACTIVE_LOW),
>>       },
>>   };
>>  
>
> Does board-da830-evm.c need the same fix? It also uses "davinci_gpio.1".

Yes. looks like fixes are needed here and other places. I will send
patches since I have ability to test them.

Thanks,
Sekhar