From: Ben Dooks <[EMAIL PROTECTED]>
Pass the bus number we expect the S3C24XX SPI driver to attach
to via the platform data.
Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
---
drivers/spi/spi_s3c24xx.c | 14 ++++++++------
include/asm-arm/arch-s3c2410/spi.h | 1 +
2 files changed, 9 insertions(+), 6 deletions(-)
--- at91.orig/drivers/spi/spi_s3c24xx.c 2008-04-15 10:30:28.000000000 -0700
+++ at91/drivers/spi/spi_s3c24xx.c 2008-04-15 10:30:32.000000000 -0700
@@ -235,6 +235,7 @@ static irqreturn_t s3c24xx_spi_irq(int i
static int __init s3c24xx_spi_probe(struct platform_device *pdev)
{
+ struct s3c2410_spi_info *pdata;
struct s3c24xx_spi *hw;
struct spi_master *master;
struct resource *res;
@@ -251,10 +252,10 @@ static int __init s3c24xx_spi_probe(stru
memset(hw, 0, sizeof(struct s3c24xx_spi));
hw->master = spi_master_get(master);
- hw->pdata = pdev->dev.platform_data;
+ hw->pdata = pdata = pdev->dev.platform_data;
hw->dev = &pdev->dev;
- if (hw->pdata == NULL) {
+ if (pdata == NULL) {
dev_err(&pdev->dev, "No platform data supplied\n");
err = -ENOENT;
goto err_no_pdata;
@@ -266,6 +267,7 @@ static int __init s3c24xx_spi_probe(stru
/* setup the master state. */
master->num_chipselect = hw->pdata->num_cs;
+ master->bus_num = pdata->bus_num;
/* setup the state for the bitbang driver */
@@ -334,13 +336,13 @@ static int __init s3c24xx_spi_probe(stru
/* setup any gpio we can */
- if (!hw->pdata->set_cs) {
+ if (!pdata->set_cs) {
hw->set_cs = s3c24xx_spi_gpiocs;
- s3c2410_gpio_setpin(hw->pdata->pin_cs, 1);
- s3c2410_gpio_cfgpin(hw->pdata->pin_cs, S3C2410_GPIO_OUTPUT);
+ s3c2410_gpio_setpin(pdata->pin_cs, 1);
+ s3c2410_gpio_cfgpin(pdata->pin_cs, S3C2410_GPIO_OUTPUT);
} else
- hw->set_cs = hw->pdata->set_cs;
+ hw->set_cs = pdata->set_cs;
/* register our spi controller */
--- at91.orig/include/asm-arm/arch-s3c2410/spi.h 2008-04-15
10:30:28.000000000 -0700
+++ at91/include/asm-arm/arch-s3c2410/spi.h 2008-04-15 10:30:32.000000000
-0700
@@ -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);
};
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
spi-devel-general mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
