omap2_mcspi.c: Clock divider range check wrong for OMAP3

Commit Message

Scott Ellis March 8, 2010, 11:56 a.m. UTC

None

Patch

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index fe1b56d..a73127b 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -38,8 +38,17 @@ 
 #include <plat/dma.h>
 #include <plat/clock.h>
 
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#define OMAP2_MCSPI_MAX_CLK_DIV                12
+#else
+/* could be 12 for OMAP24xxx also, no docs to check */
+#define OMAP2_MCSPI_MAX_CLK_DIV                15
+#endif
 
 #define OMAP2_MCSPI_MAX_FREQ           48000000
+#define OMAP2_MCSPI_MIN_FREQ   (OMAP2_MCSPI_MAX_FREQ \
+                                       / (1 << OMAP2_MCSPI_MAX_CLK_DIV))
+
 
 /* OMAP2 has 3 SPI controllers, while OMAP3 has 4 */
 #define OMAP2_MCSPI_MAX_CTRL           4
@@ -588,11 +597,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 <= OMAP2_MCSPI_MAX_CLK_DIV && 
+                       (OMAP2_MCSPI_MAX_FREQ / (1 << div)) > spi->max_speed_hz)
                        div++;
-       } else
-               div = 15;
+       } else {
+               div = OMAP2_MCSPI_MAX_CLK_DIV;
+       }
 
        l = mcspi_cached_chconf0(spi);
 
@@ -917,10 +927,10 @@  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)) {
-                       dev_dbg(&spi->dev, "%d Hz max exceeds %d\n",
+               if (t->speed_hz && t->speed_hz < OMAP2_MCSPI_MIN_FREQ) {
+                       dev_dbg(&spi->dev, "%d Hz slower then hardware minimum %d\n",
                                        t->speed_hz,
-                                       OMAP2_MCSPI_MAX_FREQ/(1<<16));
+                                       OMAP2_MCSPI_MIN_FREQ);
                        return -EINVAL;
                }