spi_mpc83xx: fix QE+LSB mode shifts

spi_mpc83xx should use other shifts when running in QE+LSB mode.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 18c475dd5709190ac68018cede05dcfc7cc4061d..72812bb9b40fe72365cbb52eab5bcbf745280aff 100644 (file)
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -237,6 +237,14 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
        } else
                return -EINVAL;
 
+       if (mpc83xx_spi->qe_mode && spi->mode & SPI_LSB_FIRST) {
+               mpc83xx_spi->tx_shift = 0;
+               if (bits_per_word <= 8)
+                       mpc83xx_spi->rx_shift = 8;
+               else
+                       mpc83xx_spi->rx_shift = 0;
+       }
+
        /* nsecs = (clock period)/2 */
        if (!hz)
                hz = spi->max_speed_hz;