[3/6] SPI omap2_mcspi.c: Use appropriate clock divider value

Commit Message

Scott Ellis March 12, 2010, 3:21 p.m. UTC

None

Patch

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index fe1b56d..37e6d73 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -37,6 +37,7 @@ 
 
 #include <plat/dma.h>
 #include <plat/clock.h>
+#include <plat/mcspi.h>
 

 #define OMAP2_MCSPI_MAX_FREQ		48000000
@@ -128,6 +129,7 @@  struct omap2_mcspi {
 	unsigned long		phys;
 	/* SPI1 has 4 channels, while SPI2 has 2 */
 	struct omap2_mcspi_dma	*dma_channels;
+	int			max_clk_div;
 };
 
 struct omap2_mcspi_cs {
@@ -588,11 +590,12 @@  static int omap2_mcspi_setup_transfer(struct spi_device *spi,
 	cs->word_len = word_len;
 
 	if (spi->max_speed_hz) {
-		while (div <= 15 && (OMAP2_MCSPI_MAX_FREQ / (1 << div))
-					> spi->max_speed_hz)
+		while (div <= mcspi->max_clk_div &&
+			(OMAP2_MCSPI_MAX_FREQ/(1 << div)) > spi->max_speed_hz)
 			div++;
-	} else
-		div = 15;
+	} else {
+		div = mcspi->max_clk_div;
+	}
 
 	l = mcspi_cached_chconf0(spi);
 
@@ -893,6 +896,8 @@  static int omap2_mcspi_transfer(struct spi_device *spi, struct spi_message *m)
 	unsigned long		flags;
 	struct spi_transfer	*t;
 
+	mcspi = spi_master_get_devdata(spi->master);
+
 	m->actual_length = 0;
 	m->status = 0;
 
@@ -917,10 +922,13 @@  static int omap2_mcspi_transfer(struct spi_device *spi, struct spi_message *m)
 					t->bits_per_word);
 			return -EINVAL;
 		}
-		if (t->speed_hz && t->speed_hz < OMAP2_MCSPI_MAX_FREQ/(1<<16)) {
+		if (t->speed_hz &&
+			t->speed_hz < OMAP2_MCSPI_MAX_FREQ
+					/(1 << mcspi->max_clk_div)) {
 			dev_dbg(&spi->dev, "%d Hz max exceeds %d\n",
-					t->speed_hz,
-					OMAP2_MCSPI_MAX_FREQ/(1<<16));
+				t->speed_hz,
+				OMAP2_MCSPI_MAX_FREQ
+					/(1 << mcspi->max_clk_div));
 			return -EINVAL;
 		}
 
@@ -955,8 +963,6 @@  static int omap2_mcspi_transfer(struct spi_device *spi, struct spi_message *m)
 		}
 	}
 
-	mcspi = spi_master_get_devdata(spi->master);
-
 	spin_lock_irqsave(&mcspi->lock, flags);
 	list_add_tail(&m->queue, &mcspi->msg_queue);
 	queue_work(omap2_mcspi_wq, &mcspi->work);
@@ -1049,6 +1055,7 @@  static int __init omap2_mcspi_probe(struct platform_device *pdev)
 	int			status = 0, i;
 	const u8		*rxdma_id, *txdma_id;
 	unsigned		num_chipselect;
+	struct omap2_mcspi_platform_config *pdata;
 
 	switch (pdev->id) {
 	case 1:
@@ -1101,6 +1108,8 @@  static int __init omap2_mcspi_probe(struct platform_device *pdev)
 
 	mcspi = spi_master_get_devdata(master);
 	mcspi->master = master;
+	pdata = (struct omap2_mcspi_platform_config *)pdev->dev.platform_data;
+	mcspi->max_clk_div = pdata->max_clk_div;
 
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (r == NULL) {