From 3b16061615781b187124c2534080441f19164118 Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Mon, 10 Jun 2013 21:31:20 +0200 Subject: arm: omap: am33xx: set up SPI devices Signed-off-by: Jan Luebbe Signed-off-by: Sascha Hauer --- drivers/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/spi') diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index f14e28f545..c279c2160f 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -40,7 +40,7 @@ config DRIVER_SPI_MXS config DRIVER_SPI_OMAP3 bool "OMAP3 McSPI Master driver" - depends on ARCH_OMAP3 + depends on ARCH_OMAP3 || ARCH_AM33XX endif -- cgit v1.2.3 From e3de0065c47679c6398961cd5be3df471e692a5e Mon Sep 17 00:00:00 2001 From: Teresa Gámez Date: Wed, 19 Jun 2013 09:09:43 +0200 Subject: omap3_spi: Remove CS check in driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Board file or DT has to take care that the correct chip select and bus values are used. Signed-off-by: Teresa Gámez Signed-off-by: Sascha Hauer --- drivers/spi/omap3_spi.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'drivers/spi') diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index e6581dfd32..02aacfff21 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -325,17 +325,6 @@ static int omap3_spi_transfer(struct spi_device *spi, struct spi_message *mesg) static int omap3_spi_setup(struct spi_device *spi) { - struct spi_master *master = spi->master; - - if (((master->bus_num == 1) && (spi->chip_select > 3)) || - ((master->bus_num == 2) && (spi->chip_select > 1)) || - ((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; - } - if (spi->max_speed_hz > OMAP3_MCSPI_MAX_FREQ) { printf("SPI error: unsupported frequency %i Hz. \ Max frequency is 48 Mhz\n", spi->max_speed_hz); -- cgit v1.2.3 From 1806c82ce8c83836972c306db3a46900721179c0 Mon Sep 17 00:00:00 2001 From: Teresa Gámez Date: Wed, 19 Jun 2013 09:09:44 +0200 Subject: omap3_spi: Set the correct CS number for AM33xx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed the number of CS for AM33xx boards to 2. Signed-off-by: Teresa Gámez Signed-off-by: Sascha Hauer --- drivers/spi/omap3_spi.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'drivers/spi') diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 02aacfff21..5c8cc8882a 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -357,16 +357,24 @@ static int omap3_spi_probe(struct device_d *dev) * McSPI3 has 2 CS (bus 3, cs 0 - 1) * McSPI4 has 1 CS (bus 4, cs 0) * + * AM335x McSPI has 2 busses with 2 chip selects: + * McSPI0 has 2 CS (bus 0, cs 0 - 1) + * McSPI1 has 2 CS (bus 1, cs 0 - 1) + * * The board code has to make sure that it does not use * invalid buses or chip selects. */ master->bus_num = dev->id; - master->num_chipselect = 4; + + if (IS_ENABLED(CONFIG_ARCH_OMAP3)) + master->num_chipselect = 4; + else + master->num_chipselect = 2; master->setup = omap3_spi_setup; master->transfer = omap3_spi_transfer; - omap3_master->regs = dev_request_mem_region(dev, 0);; + omap3_master->regs = dev_request_mem_region(dev, 0); spi_reset(master); -- cgit v1.2.3