ARM: pxa: cm-x255: Fix up GPIO NAND device name in table

Message ID 20171006215144.18039-1-linus.walleij@linaro.org
State New
Headers show
Series
  • ARM: pxa: cm-x255: Fix up GPIO NAND device name in table
Related show

Commit Message

Linus Walleij Oct. 6, 2017, 9:51 p.m.
My patch set the device name wrong because I confused the
device name for a partition name. Sorry.

Cc: arm@kernel.org
Fixes: ("mtd: nand: gpio: Convert to use GPIO descriptors")
Reported-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
This can be squashed into the commit or applied on top
as a fix. The original patch was ACKed by the ARM SoC
maintainers so I believe this is fine to apply.
---
 arch/arm/mach-pxa/cm-x255.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.13.5


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Comments

Boris Brezillon Oct. 7, 2017, 5:49 a.m. | #1
On Fri,  6 Oct 2017 23:51:44 +0200
Linus Walleij <linus.walleij@linaro.org> wrote:

> My patch set the device name wrong because I confused the

> device name for a partition name. Sorry.

> 

> Cc: arm@kernel.org

> Fixes: ("mtd: nand: gpio: Convert to use GPIO descriptors")

> Reported-by: Robert Jarzmik <robert.jarzmik@free.fr>

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> ---

> This can be squashed into the commit or applied on top

> as a fix. The original patch was ACKed by the ARM SoC

> maintainers so I believe this is fine to apply.

> ---

>  arch/arm/mach-pxa/cm-x255.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c

> index f8d67acb7194..fa8e7dd4d898 100644

> --- a/arch/arm/mach-pxa/cm-x255.c

> +++ b/arch/arm/mach-pxa/cm-x255.c

> @@ -178,7 +178,7 @@ static inline void cmx255_init_nor(void) {}

>  #if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)

>  

>  static struct gpiod_lookup_table cmx255_nand_gpiod_table = {

> -	.dev_id         = "cmx255-nand",

> +	.dev_id         = "gpio-nand",


Are you sure it works? AFAIR, you have to set "<driver-name>.<dev-id>"
here, which, assuming there's only one gpio-nand dev, would give

	.dev_id		= "gpio-nand.0",

Regards,

Boris

>  	.table          = {

>  		GPIO_LOOKUP("gpio-pxa", GPIO_NAND_CS, "nce", GPIO_ACTIVE_HIGH),

>  		GPIO_LOOKUP("gpio-pxa", GPIO_NAND_CLE, "cle", GPIO_ACTIVE_HIGH),



______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Robert Jarzmik Oct. 7, 2017, 8 a.m. | #2
Boris Brezillon <boris.brezillon@free-electrons.com> writes:

> On Fri,  6 Oct 2017 23:51:44 +0200

> Linus Walleij <linus.walleij@linaro.org> wrote:

>

>> My patch set the device name wrong because I confused the

>> device name for a partition name. Sorry.

>> 

>> Cc: arm@kernel.org

>> Fixes: ("mtd: nand: gpio: Convert to use GPIO descriptors")

>> Reported-by: Robert Jarzmik <robert.jarzmik@free.fr>

>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

>> ---

>> This can be squashed into the commit or applied on top

>> as a fix. The original patch was ACKed by the ARM SoC

>> maintainers so I believe this is fine to apply.

>> ---

>>  arch/arm/mach-pxa/cm-x255.c | 2 +-

>>  1 file changed, 1 insertion(+), 1 deletion(-)

>> 

>> diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c

>> index f8d67acb7194..fa8e7dd4d898 100644

>> --- a/arch/arm/mach-pxa/cm-x255.c

>> +++ b/arch/arm/mach-pxa/cm-x255.c

>> @@ -178,7 +178,7 @@ static inline void cmx255_init_nor(void) {}

>>  #if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)

>>  

>>  static struct gpiod_lookup_table cmx255_nand_gpiod_table = {

>> -	.dev_id         = "cmx255-nand",

>> +	.dev_id         = "gpio-nand",

>

> Are you sure it works? AFAIR, you have to set "<driver-name>.<dev-id>"

> here, which, assuming there's only one gpio-nand dev, would give

>

> 	.dev_id		= "gpio-nand.0",

I'm sure Linus is correct this time.
This is because :
static struct platform_device cmx255_nand = {
...
	.id		= -1,
...

This -1 is the reason it will be "gpio-nand".

Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>


-- 
Robert

PS: For the next time for pxa patches I'd appreciate to be in the "To:" list, as
my other pxa co-maintainers.

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Boris Brezillon Oct. 7, 2017, 9:22 a.m. | #3
On Sat, 07 Oct 2017 10:00:16 +0200
Robert Jarzmik <robert.jarzmik@free.fr> wrote:

> Boris Brezillon <boris.brezillon@free-electrons.com> writes:

> 

> > On Fri,  6 Oct 2017 23:51:44 +0200

> > Linus Walleij <linus.walleij@linaro.org> wrote:

> >  

> >> My patch set the device name wrong because I confused the

> >> device name for a partition name. Sorry.

> >> 

> >> Cc: arm@kernel.org

> >> Fixes: ("mtd: nand: gpio: Convert to use GPIO descriptors")

> >> Reported-by: Robert Jarzmik <robert.jarzmik@free.fr>

> >> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> >> ---

> >> This can be squashed into the commit or applied on top

> >> as a fix. The original patch was ACKed by the ARM SoC

> >> maintainers so I believe this is fine to apply.

> >> ---

> >>  arch/arm/mach-pxa/cm-x255.c | 2 +-

> >>  1 file changed, 1 insertion(+), 1 deletion(-)

> >> 

> >> diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c

> >> index f8d67acb7194..fa8e7dd4d898 100644

> >> --- a/arch/arm/mach-pxa/cm-x255.c

> >> +++ b/arch/arm/mach-pxa/cm-x255.c

> >> @@ -178,7 +178,7 @@ static inline void cmx255_init_nor(void) {}

> >>  #if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)

> >>  

> >>  static struct gpiod_lookup_table cmx255_nand_gpiod_table = {

> >> -	.dev_id         = "cmx255-nand",

> >> +	.dev_id         = "gpio-nand",  

> >

> > Are you sure it works? AFAIR, you have to set "<driver-name>.<dev-id>"

> > here, which, assuming there's only one gpio-nand dev, would give

> >

> > 	.dev_id		= "gpio-nand.0",  

> I'm sure Linus is correct this time.

> This is because :

> static struct platform_device cmx255_nand = {

> ...

> 	.id		= -1,

> ...

> 

> This -1 is the reason it will be "gpio-nand".


Right. I thought -1 was PLATFORM_DEVID_AUTO, but it's
PLATFORM_DEVID_NONE.

I'll squash the change in the initial commit.

Thanks,

Boris

> 

> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

> 



______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Patch

diff --git a/arch/arm/mach-pxa/cm-x255.c b/arch/arm/mach-pxa/cm-x255.c
index f8d67acb7194..fa8e7dd4d898 100644
--- a/arch/arm/mach-pxa/cm-x255.c
+++ b/arch/arm/mach-pxa/cm-x255.c
@@ -178,7 +178,7 @@  static inline void cmx255_init_nor(void) {}
 #if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)
 
 static struct gpiod_lookup_table cmx255_nand_gpiod_table = {
-	.dev_id         = "cmx255-nand",
+	.dev_id         = "gpio-nand",
 	.table          = {
 		GPIO_LOOKUP("gpio-pxa", GPIO_NAND_CS, "nce", GPIO_ACTIVE_HIGH),
 		GPIO_LOOKUP("gpio-pxa", GPIO_NAND_CLE, "cle", GPIO_ACTIVE_HIGH),