mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
spi_s3c24xx: really assign busnum
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 commit50f426b55d
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 commit50f426b55d
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>
This commit is contained in:
parent
9a7867e1b3
commit
cb1d0a7a5d
2 changed files with 2 additions and 0 deletions
|
@ -270,6 +270,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
|
||||||
/* setup the master state. */
|
/* setup the master state. */
|
||||||
|
|
||||||
master->num_chipselect = hw->pdata->num_cs;
|
master->num_chipselect = hw->pdata->num_cs;
|
||||||
|
master->bus_num = pdata->bus_num;
|
||||||
|
|
||||||
/* setup the state for the bitbang driver */
|
/* setup the state for the bitbang driver */
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
struct s3c2410_spi_info {
|
struct s3c2410_spi_info {
|
||||||
unsigned long pin_cs; /* simple gpio cs */
|
unsigned long pin_cs; /* simple gpio cs */
|
||||||
unsigned int num_cs; /* total chipselects */
|
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);
|
void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue