1 files changed, 26 insertions, 4 deletions

diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 3295cfcc9f20..0c16a2b39b41 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -39,6 +39,7 @@ struct mpc83xx_spi_reg {
 };
 
 /* SPI Controller mode register definitions */
+#define SPMODE_LOOP             (1 << 30)
 #define SPMODE_CI_INACTIVEHIGH  (1 << 29)
 #define SPMODE_CP_BEGIN_EDGECLK (1 << 28)
 #define SPMODE_DIV16            (1 << 27)
@@ -153,12 +154,18 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
                         len = len - 1;
 
                 /* mask out bits we are going to set */
-                regval &= ~0x38ff0000;
+                regval &= ~(SPMODE_CP_BEGIN_EDGECLK | SPMODE_CI_INACTIVEHIGH
+                                | SPMODE_LEN(0xF) | SPMODE_DIV16
+                                | SPMODE_PM(0xF) | SPMODE_REV | SPMODE_LOOP);
 
                 if (spi->mode & SPI_CPHA)
                         regval |= SPMODE_CP_BEGIN_EDGECLK;
                 if (spi->mode & SPI_CPOL)
                         regval |= SPMODE_CI_INACTIVEHIGH;
+                if (!(spi->mode & SPI_LSB_FIRST))
+                        regval |= SPMODE_REV;
+                if (spi->mode & SPI_LOOP)
+                        regval |= SPMODE_LOOP;
 
                 regval |= SPMODE_LEN(len);
 
@@ -176,6 +183,8 @@ static void mpc83xx_spi_chipselect(struct spi_device *spi, int value)
                         regval |= SPMODE_PM(pm);
                 }
 
+                /* Turn off SPI unit prior changing mode */
+                mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, 0);
                 mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval);
                 if (mpc83xx_spi->activate_cs)
                         mpc83xx_spi->activate_cs(spi->chip_select, pol);
@@ -231,6 +240,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;
@@ -245,17 +262,22 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
 
         regval = mpc83xx_spi_read_reg(&mpc83xx_spi->base->mode);
 
-        /* Mask out bits_per_wordgth */
-        regval &= 0xff0fffff;
+        /* mask out bits we are going to set */
+        regval &= ~(SPMODE_LEN(0xF) | SPMODE_REV);
         regval |= SPMODE_LEN(bits_per_word);
+        if (!(spi->mode & SPI_LSB_FIRST))
+                regval |= SPMODE_REV;
 
+        /* Turn off SPI unit prior changing mode */
+        mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, 0);
         mpc83xx_spi_write_reg(&mpc83xx_spi->base->mode, regval);
 
         return 0;
 }
 
 /* the spi->mode bits understood by this driver: */
-#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)
+#define MODEBITS        (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH \
+                        | SPI_LSB_FIRST | SPI_LOOP)
 
 static int mpc83xx_spi_setup(struct spi_device *spi)
 {