[PATCHv3 3/4] omap3_spi: Set the correct CS number for AM33xx

Teresa Gámez t.gamez at phytec.de
Wed Jun 19 03:09:44 EDT 2013


Changed the number of CS for AM33xx boards to 2.

Signed-off-by: Teresa Gámez <t.gamez at phytec.de>
---
changes since v3:
        - splitted the former "omap3_spi: Add CS check for AM335x"
          patch into two
	- Set correct number of CS here

 drivers/spi/omap3_spi.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index 508e2d9..1a92565 100644
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -359,16 +359,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);
 
-- 
1.7.0.4




More information about the barebox mailing list