diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-09-26 14:38:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 09:38:06 +0100 |
| commit | 630c4ecc5e0a9ddf533de260daa7b414b5c0d0b0 (patch) | |
| tree | 94b947f0d5140dfd8d47da8c54cb3a24f6a577bd /drivers/spi/omap3_spi.c | |
| parent | 7230ca2380dbf15ab05531aee67a38f32af9a0e9 (diff) | |
| download | barebox-630c4ecc5e0a9ddf533de260daa7b414b5c0d0b0.tar.gz barebox-630c4ecc5e0a9ddf533de260daa7b414b5c0d0b0.tar.xz | |
omap3_spi: fix bus numbers according to omap3_add_spi[1-4]
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi/omap3_spi.c')
| -rw-r--r-- | drivers/spi/omap3_spi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 29cb69ae2f..f81b4aa9d1 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -327,10 +327,10 @@ static int omap3_spi_setup(struct spi_device *spi) { struct spi_master *master = spi->master; - if (((master->bus_num == 0) && (spi->chip_select > 3)) || - ((master->bus_num == 1) && (spi->chip_select > 1)) || + if (((master->bus_num == 1) && (spi->chip_select > 3)) || ((master->bus_num == 2) && (spi->chip_select > 1)) || - ((master->bus_num == 3) && (spi->chip_select > 0))) { + ((master->bus_num == 3) && (spi->chip_select > 1)) || + ((master->bus_num == 4) && (spi->chip_select > 0))) { printf("SPI error: unsupported chip select %i \ on bus %i\n", spi->chip_select, master->bus_num); return -EINVAL; @@ -363,10 +363,10 @@ static int omap3_spi_probe(struct device_d *dev) /* * OMAP3 McSPI (MultiChannel SPI) has 4 busses (modules) * with different number of chip selects (CS, channels): - * McSPI1 has 4 CS (bus 0, cs 0 - 3) - * McSPI2 has 2 CS (bus 1, cs 0 - 1) - * McSPI3 has 2 CS (bus 2, cs 0 - 1) - * McSPI4 has 1 CS (bus 3, cs 0) + * McSPI1 has 4 CS (bus 1, cs 0 - 3) + * McSPI2 has 2 CS (bus 2, cs 0 - 1) + * McSPI3 has 2 CS (bus 3, cs 0 - 1) + * McSPI4 has 1 CS (bus 4, cs 0) * * The board code has to make sure that it does not use * invalid buses or chip selects. |