Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/imx', 'spi/fix/omap2-mcspi...

diff --combined drivers/spi/spi-atmel.c
index 63318e2afba1900bc3923d3b4023143699a4842e,41d95a662be73946ffdfcb50667908c1b8243332,bf9ed380bb1c0754addbd27aedf7d874cee89ff2,bf9ed380bb1c0754addbd27aedf7d874cee89ff2,bf9ed380bb1c0754addbd27aedf7d874cee89ff2,bf9ed380bb1c0754addbd27aedf7d874cee89ff2..3fff59ce065f3057f4a1f34a9165b61cd592ee15
--- 1/drivers/spi/spi-atmel.c
--- 2/drivers/spi/spi-atmel.c
--- 3/drivers/spi/spi-atmel.c
--- 4/drivers/spi/spi-atmel.c
--- 5/drivers/spi/spi-atmel.c
--- 6/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@@@@@@ -773,7 -773,8 -773,7 -773,7 -773,7 -773,7 +773,8 @@@@@@@ static int atmel_spi_next_xfer_dma_subm
      
        *plen = len;
      
- ----  if (atmel_spi_dma_slave_config(as, &slave_config, 8))
+ ++++  if (atmel_spi_dma_slave_config(as, &slave_config,
+ ++++                                 xfer->bits_per_word))
                goto err_exit;
      
        /* Send both scatterlists */
@@@@@@@ -1720,7 -1721,6 -1720,6 -1720,6 -1720,6 -1720,6 +1721,7 @@@@@@@ static int atmel_spi_runtime_resume(str
        return clk_prepare_enable(as->clk);
      }
      
 +++++#ifdef CONFIG_PM_SLEEP
      static int atmel_spi_suspend(struct device *dev)
      {
        struct spi_master *master = dev_get_drvdata(dev);
@@@@@@@ -1757,7 -1757,6 -1756,6 -1756,6 -1756,6 -1756,6 +1758,7 @@@@@@@ static int atmel_spi_resume(struct devi
      
        return ret;
      }
 +++++#endif
      
      static const struct dev_pm_ops atmel_spi_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(atmel_spi_suspend, atmel_spi_resume)