Merge tag 'spi-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi updates from Mark Brown:
 "A quiet release, more bug fixes than anything else.  A few things do
  stand out though:

   - updates to several drivers to move towards the standard GPIO chip
     select handling in the core.
   - DMA support for the SH MSIOF driver.
   - support for Rockchip SPI controllers (their first mainline
     submission)"

* tag 'spi-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (64 commits)
  spi: davinci: use spi_device.cs_gpio to store gpio cs per spi device
  spi: davinci: add support to configure gpio cs through dt
  spi/pl022: Explicitly truncate large bitmask
  spi/atmel: Fix pointer to int conversion warnings on 64 bit builds
  spi: davinci: fix to support more than 2 chip selects
  spi: topcliff-pch: don't hardcode PCI slot to get DMA device
  spi: orion: fix incorrect handling of cell-index DT property
  spi: orion: Fix error return code in orion_spi_probe()
  spi/rockchip: fix error return code in rockchip_spi_probe()
  spi/rockchip: remove redundant dev_err call in rockchip_spi_probe()
  spi/rockchip: remove duplicated include from spi-rockchip.c
  ARM: dts: fix the chip select gpios definition in the SPI nodes
  spi: s3c64xx: Update binding documentation
  spi: s3c64xx: use the generic SPI "cs-gpios" property
  spi: s3c64xx: Revert "spi: s3c64xx: Added provision for dedicated cs pin"
  spi: atmel: Use dmaengine_prep_slave_sg() API
  spi: topcliff-pch: Update error messages for dmaengine_prep_slave_sg() API
  spi: sh-msiof: Use correct device for DMA mapping with IOMMU
  spi: sh-msiof: Handle dmaengine_prep_slave_single() failures gracefully
  spi: rspi: Handle dmaengine_prep_slave_sg() failures gracefully
  ...

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 4dc77df38864..68441fa448de 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -149,6 +149,7 @@ struct omap2_mcspi_cs {
         void __iomem            *base;
         unsigned long           phys;
         int                     word_len;
+        u16                     mode;
         struct list_head        node;
         /* Context save and restore shadow register */
         u32                     chconf0, chctrl0;
@@ -926,6 +927,8 @@ static int omap2_mcspi_setup_transfer(struct spi_device *spi,
 
         mcspi_write_chconf0(spi, l);
 
+        cs->mode = spi->mode;
+
         dev_dbg(&spi->dev, "setup: speed %d, sample %s edge, clk %s\n",
                         speed_hz,
                         (spi->mode & SPI_CPHA) ? "trailing" : "leading",
@@ -998,6 +1001,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
                         return -ENOMEM;
                 cs->base = mcspi->base + spi->chip_select * 0x14;
                 cs->phys = mcspi->phys + spi->chip_select * 0x14;
+                cs->mode = 0;
                 cs->chconf0 = 0;
                 cs->chctrl0 = 0;
                 spi->controller_state = cs;
@@ -1079,6 +1083,16 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m)
         cs = spi->controller_state;
         cd = spi->controller_data;
 
+        /*
+         * The slave driver could have changed spi->mode in which case
+         * it will be different from cs->mode (the current hardware setup).
+         * If so, set par_override (even though its not a parity issue) so
+         * omap2_mcspi_setup_transfer will be called to configure the hardware
+         * with the correct mode on the first iteration of the loop below.
+         */
+        if (spi->mode != cs->mode)
+                par_override = 1;
+
         omap2_mcspi_set_enable(spi, 0);
         list_for_each_entry(t, &m->transfers, transfer_list) {
                 if (t->tx_buf == NULL && t->rx_buf == NULL && t->len) {