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

PATCH New Linus Walleij 3 participants 4 messages Oct 6, 2017 – Oct 7, 2017

Subsystems (4)

Arm (32-bit) Arm sub-architectures Memory technology devices (MTD) PXA2xx/PXA3xx support

lore

Share & tools

lore

Linus Walleij

author

2017-10-06 21:51 UTC #0 lore raw

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

My patch set the device name wrong because I confused the device name for a partition name. Sorry.

Cc arm at kernel.org

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

Reported-by Robert Jarzmik <[email protected]>

Signed-off-by Linus Walleij <[email protected]>

---
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(-)

arch/arm/mach-pxa/cm-x255.c +1 -1

index f8d67acb7194..fa8e7dd4d898 100644
@@ -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),

Signature · 1 line

2.13.5

Boris Brezillon

2017-10-07 05:49 UTC #1 lore raw

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

Quoted 20 lines · On Fri, 6 Oct 2017 23:51:44 +0200 Linus Walleij <[email protected]>…

My patch set the device name wrong because I confused the device name for a partition name. Sorry.
Cc arm at kernel.org
Fixes ("mtd: nand: gpio: Convert to use GPIO descriptors")
Reported-by Robert Jarzmik <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
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(-)
arch/arm/mach-pxa/cm-x255.c +0 -0
index f8d67acb7194..fa8e7dd4d898 100644

arch/arm/mach-pxa/cm-x255.c static inline void cmx255_init_nor(void) {} · line 181

Quoted 5 lines

arch/arm/mach-pxa/cm-x255.c +1 -1

@@ -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

Quoted 3 lines

arch/arm/mach-pxa/cm-x255.c +0 -0

 	.table          = {
 		GPIO_LOOKUP("gpio-pxa", GPIO_NAND_CS, "nce", GPIO_ACTIVE_HIGH),
 		GPIO_LOOKUP("gpio-pxa", GPIO_NAND_CLE, "cle", GPIO_ACTIVE_HIGH),

Robert Jarzmik

maintainer

2017-10-07 08:00 UTC #2 lore raw

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

Quoted 25 lines · Boris Brezillon

Quoted 22 lines · On Fri, 6 Oct 2017 23:51:44 +0200 Linus Walleij <[email protected]>…
My patch set the device name wrong because I confused the device name for a partition name. Sorry.
Cc arm at kernel.org
Fixes ("mtd: nand: gpio: Convert to use GPIO descriptors")
Reported-by Robert Jarzmik <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
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(-)
arch/arm/mach-pxa/cm-x255.c +0 -0
index f8d67acb7194..fa8e7dd4d898 100644
@@ -178,7 +178,7 @@ static inline void cmx255_init_nor(void) {}
 #if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)
 

Quoted 8 lines

arch/arm/mach-pxa/cm-x255.c static inline void cmx255_init_nor(void) {} · line 181
Quoted 3 lines
arch/arm/mach-pxa/cm-x255.c +1 -1
 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 <[email protected]>

Signature · 4 lines

Robert

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

Boris Brezillon

2017-10-07 09:22 UTC #3 lore raw

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

Quoted 35 lines · On Sat, 07 Oct 2017 10:00:16 +0200 Robert Jarzmik <[email protected]>…

Quoted 25 lines · Boris Brezillon
Quoted 22 lines · On Fri, 6 Oct 2017 23:51:44 +0200 Linus Walleij <[email protected]>…
My patch set the device name wrong because I confused the device name for a partition name. Sorry.
Cc arm at kernel.org
Fixes ("mtd: nand: gpio: Convert to use GPIO descriptors")
Reported-by Robert Jarzmik <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
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(-)
arch/arm/mach-pxa/cm-x255.c +0 -0
index f8d67acb7194..fa8e7dd4d898 100644
@@ -178,7 +178,7 @@ static inline void cmx255_init_nor(void) {}
 #if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)
 
Quoted 8 lines
arch/arm/mach-pxa/cm-x255.c static inline void cmx255_init_nor(void) {} · line 181
Quoted 3 lines
arch/arm/mach-pxa/cm-x255.c +1 -1
 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",  

Quoted 8 lines

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

Quoted 3 lines

Acked-by Robert Jarzmik <[email protected]>