]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
spi_s3c24xx: really assign busnum
authorBen Dooks <ben-linux@fluff.org>
Mon, 28 Jul 2008 22:46:33 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jul 2008 23:30:21 +0000 (16:30 -0700)
The original "Pass the bus number we expect the S3C24XX SPI driver to
attach to via the platform data." [1] patch was mis-sent, and missed two
important parts of the diff, which was to actually set the bus_num field
and add the relevant field to the platform data.

The previous commit 50f426b55d919dd017af35bb6a08753d1f262920 promised to
add a bus_num field, but failed to include the two hunks that added this
field to include/asm-arm/arch-s3c2410/spi.h and then pass it to the spi
core when creating the new master field in drivers/spi/spi_s3c24xx.c.

[1] git commit 50f426b55d919dd017af35bb6a08753d1f262920

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/spi/spi_s3c24xx.c
include/asm-arm/arch-s3c2410/spi.h

index 0885cc357a371552dc2190a6da682f98a652abdb..1c643c9e1f15ff793e5d7c140e9f93ee96320544 100644 (file)
@@ -270,6 +270,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
        /* setup the master state. */
 
        master->num_chipselect = hw->pdata->num_cs;
+       master->bus_num = pdata->bus_num;
 
        /* setup the state for the bitbang driver */
 
index 352d33860b6383a6584011edb5239b23b3ebcd1b..442169887d3b0d4e810df46059b2c65ca76df64d 100644 (file)
@@ -16,6 +16,7 @@
 struct s3c2410_spi_info {
        unsigned long            pin_cs;        /* simple gpio cs */
        unsigned int             num_cs;        /* total chipselects */
+       int                      bus_num;       /* bus number to use. */
 
        void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
 };