Skip to contentSkip to conversation

p54spi: replace internal "cx3110x" name with "p54spi"

PATCH In review Luke-Jr 3 participants 5 messages Jun 2, 2010 – Jul 31, 2010 Networking drivers (wireless)

lore
Share & tools
lore

Luke-Jr

author
#0 lore raw

PATCH 1/1 p54spi: replace internal "cx3110x" name with "p54spi"

While the comment removed in this patch claims board_n800.c uses "cx3110x", it was never merged to mainline like this.
Mainlined board files for Nokia N8x0 devices are expected "p54spi", and thus don't work because the modalias is "cx3110x".
To my knowledge, these devices are the only real-world use of p54spi, and will not work without this change. Tested against my Nokia N810.

Signed-off-by Luke Dashjr <[email protected]>
---
 drivers/net/wireless/p54/p54spi.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/p54/p54spi.c +2 -3
index c8f09da..087bf06 100644
@@ -697,9 +697,7 @@ static int __devexit p54spi_remove(struct spi_device *spi)
 
 static struct spi_driver p54spi_driver = {
 	.driver = {
-		/* use cx3110x name because board-n800.c uses that for the
-		 * SPI port */
-		.name		= "cx3110x",
+		.name		= "p54spi",
 		.bus		= &spi_bus_type,
 		.owner		= THIS_MODULE,
 	},

@@ -733,3 +731,4 @@ module_exit(p54spi_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Christian Lamparter <[email protected]>");
 MODULE_ALIAS("spi:cx3110x");
+MODULE_ALIAS("spi:p54spi");
Signature · 1 line
1.6.4.4
maintainer
#1 lore raw

drivers/net/wireless/p54/p54spi.c static int __devexit p54spi_remove(struct spi_device *spi) · line 701

Quoted 7 lines · Luke-Jr

static struct spi_driver p54spi_driver = {

drivers/net/wireless/p54/p54spi.c +1 -3
 	.driver = {
-		/* use cx3110x name because board-n800.c uses that for the
-		 * SPI port */
-		.name		= "cx3110x",
+		.name		= "p54spi",
 		.bus		= &spi_bus_type,

maybe that comment wasn't clear enough ... it needs to be that way to be properly linked up against SPI.

johannes

author
#2 lore raw
Quoted 11 lines · Johannes Berg

drivers/net/wireless/p54/p54spi.c static int __devexit p54spi_remove(struct spi_device *spi) · line 701

Quoted 7 lines · Luke-Jr

static struct spi_driver p54spi_driver = {

drivers/net/wireless/p54/p54spi.c +1 -3
 	.driver = {
-		/* use cx3110x name because board-n800.c uses that for the
-		 * SPI port */
-		.name		= "cx3110x",
+		.name		= "p54spi",
 		.bus		= &spi_bus_type,

maybe that comment wasn't clear enough ... it needs to be that way to be properly linked up against SPI.

I don't understand what you mean here. Does the hardware-side of SPI use string identifiers? These are the only two instances of "cx3110x" in the kernel source; N8x0 board files expect "p54spi"

maintainer
#3 lore raw
Quoted 10 lines · Luke-Jr
Quoted 9 lines

drivers/net/wireless/p54/p54spi.c static int __devexit p54spi_remove(struct spi_device *spi) · line 701

Quoted 6 lines
drivers/net/wireless/p54/p54spi.c +1 -3
 	.driver = {
-		/* use cx3110x name because board-n800.c uses that for the
-		 * SPI port */
-		.name		= "cx3110x",
+		.name		= "p54spi",
 		.bus		= &spi_bus_type,

maybe that comment wasn't clear enough ... it needs to be that way to be properly linked up against SPI.

Quoted 3 lines

I don't understand what you mean here. Does the hardware-side of SPI use string identifiers? These are the only two instances of "cx3110x" in the kernel source; N8x0 board files expect "p54spi"

Hm, ok, I thought that the board stuff needed cx3110x. Hopefully it doesn't differ in n810s?

johannes

#4 lore raw
Quoted 12 lines · Johannes Berg
Quoted 10 lines · Luke-Jr
Quoted 9 lines

drivers/net/wireless/p54/p54spi.c static int __devexit p54spi_remove(struct spi_device *spi) · line 701

Quoted 6 lines
drivers/net/wireless/p54/p54spi.c +1 -3
 	.driver = {
-		/* use cx3110x name because board-n800.c uses that for the
-		 * SPI port */
-		.name		= "cx3110x",
+		.name		= "p54spi",
 		.bus		= &spi_bus_type,

maybe that comment wasn't clear enough ... it needs to be that way to be properly linked up against SPI.

Quoted 6 lines
Quoted 3 lines

I don't understand what you mean here. Does the hardware-side of SPI use string identifiers? These are the only two instances of "cx3110x" in the kernel source; N8x0 board files expect "p54spi"

Hm, ok, I thought that the board stuff needed cx3110x. Hopefully it doesn't differ in n810s?

I changed the n8x0 board files (for both n800 and n810) in mainline to use p54spi. So this patch is correct.

The old maemo kernels and the closed driver used cx3110x to identify the spi device.

Signature · 1 line
Kalle Valo