Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 19 insertions, 11 deletions

diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index ba1a872b221e..e0de0d0eedea 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -32,11 +32,12 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/slab.h>
 
 #include <linux/spi/spi.h>
 
-#include <mach/dma.h>
-#include <mach/clock.h>
+#include <plat/dma.h>
+#include <plat/clock.h>
 
 
 #define OMAP2_MCSPI_MAX_FREQ            48000000
@@ -203,6 +204,7 @@ static inline void mcspi_write_chconf0(const struct spi_device *spi, u32 val)
 
         cs->chconf0 = val;
         mcspi_write_cs_reg(spi, OMAP2_MCSPI_CHCONF0, val);
+        mcspi_read_cs_reg(spi, OMAP2_MCSPI_CHCONF0);
 }
 
 static void omap2_mcspi_set_dma_req(const struct spi_device *spi,
@@ -531,7 +533,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                         goto out;
                                 }
 #ifdef VERBOSE
-                                dev_dbg(&spi->dev, "write-%d %04x\n",
+                                dev_dbg(&spi->dev, "write-%d %08x\n",
                                                 word_len, *tx);
 #endif
                                 __raw_writel(*tx++, tx_reg);
@@ -549,7 +551,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                         mcspi_write_chconf0(spi, l);
                                 *rx++ = __raw_readl(rx_reg);
 #ifdef VERBOSE
-                                dev_dbg(&spi->dev, "read-%d %04x\n",
+                                dev_dbg(&spi->dev, "read-%d %08x\n",
                                                 word_len, *(rx - 1));
 #endif
                         }
@@ -578,6 +580,7 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
         struct spi_master *spi_cntrl;
         u32 l = 0, div = 0;
         u8 word_len = spi->bits_per_word;
+        u32 speed_hz = spi->max_speed_hz;
 
         mcspi = spi_master_get_devdata(spi->master);
         spi_cntrl = mcspi->master;
@@ -587,9 +590,12 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
 
         cs->word_len = word_len;
 
-        if (spi->max_speed_hz) {
+        if (t && t->speed_hz)
+                speed_hz = t->speed_hz;
+
+        if (speed_hz) {
                 while (div <= 15 && (OMAP2_MCSPI_MAX_FREQ / (1 << div))
-                                        > spi->max_speed_hz)
+                                        > speed_hz)
                         div++;
         } else
                 div = 15;
@@ -751,11 +757,13 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
         mcspi = spi_master_get_devdata(spi->master);
         mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
-        /* Unlink controller state from context save list */
-        cs = spi->controller_state;
-        list_del(&cs->node);
+        if (spi->controller_state) {
+                /* Unlink controller state from context save list */
+                cs = spi->controller_state;
+                list_del(&cs->node);
 
-        kfree(spi->controller_state);
+                kfree(spi->controller_state);
+        }
 
         if (mcspi_dma->dma_rx_channel != -1) {
                 omap_free_dma(mcspi_dma->dma_rx_channel);
@@ -1014,7 +1022,7 @@ static u8 __initdata spi2_txdma_id[] = {
         OMAP24XX_DMA_SPI2_TX1,
 };
 
-#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX) \
+#if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) \
         || defined(CONFIG_ARCH_OMAP4)
 static u8 __initdata spi3_rxdma_id[] = {
         OMAP24XX_DMA_SPI3_RX0,