[PATCH] p54spi: replace internal "cx3110x" name with "p54spi"

[PATCH] p54spi: replace internal "cx3110x" name with "p54spi"

[Luke-Jr]

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 <luke-jr+git@utopios.org>
---
 drivers/net/wireless/p54/p54spi.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index c8f09da..087bf06 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -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 <chunkeey@web.de>");
 MODULE_ALIAS("spi:cx3110x");
+MODULE_ALIAS("spi:p54spi");
-- 
1.6.4.4

Re: [PATCH] p54spi: replace internal "cx3110x" name with "p54spi"

[Johannes Berg]

On Tue, 2010-06-01 at 21:16 -0500, Luke-Jr wrote:

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

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

johannes

Re: [PATCH] p54spi: replace internal "cx3110x" name with "p54spi"

[Luke-Jr]

On Wednesday 02 June 2010 02:54:59 am Johannes Berg wrote:
> On Tue, 2010-06-01 at 21:16 -0500, Luke-Jr wrote:
> >  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,
> 
> 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"

Re: [PATCH] p54spi: replace internal "cx3110x" name with "p54spi"

[Johannes Berg]

On Wed, 2010-06-02 at 14:06 -0500, Luke-Jr wrote:

> > >  	.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"

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

johannes

Re: [PATCH] p54spi: replace internal "cx3110x" name with "p54spi"

[Kalle Valo]

Johannes Berg <johannes@sipsolutions.net> writes:

> On Wed, 2010-06-02 at 14:06 -0500, Luke-Jr wrote:
>
>> > >  	.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"
>
> 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.

-- 
Kalle Valo