spi/spi-fsl-spi: Move setting non-zero tx and rx shifts to a function accessed by...

Acked-by: Anton Vorontsov <anton@enomsg.org>
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/drivers/spi/spi-fsl-lib.h b/drivers/spi/spi-fsl-lib.h
index d785595c206e8df9fab5fa345bbdf86dbe2c2f6f..eae54b666907b46fdbf525ab1d97d1e3279b4697 100644 (file)
--- a/drivers/spi/spi-fsl-lib.h
+++ b/drivers/spi/spi-fsl-lib.h
@@ -69,6 +69,11 @@ struct mpc8xxx_spi {
 
        unsigned int flags;
 
+#ifdef CONFIG_SPI_FSL_SPI
+       void (*set_shifts)(u32 *rx_shift, u32 *tx_shift,
+                          int bits_per_word, int msb_first);
+#endif
+
        struct workqueue_struct *workqueue;
        struct work_struct work;
 

diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 1569f7defc7354b7a5b96cd3b26f2b018307287e..aba00fd0791f30b0c7674cf299784e49d8406443 100644 (file)
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -91,6 +91,25 @@ static void fsl_spi_chipselect(struct spi_device *spi, int value)
        }
 }
 
+static void fsl_spi_qe_cpu_set_shifts(u32 *rx_shift, u32 *tx_shift,
+                                     int bits_per_word, int msb_first)
+{
+       *rx_shift = 0;
+       *tx_shift = 0;
+       if (msb_first) {
+               if (bits_per_word <= 8) {
+                       *rx_shift = 16;
+                       *tx_shift = 24;
+               } else if (bits_per_word <= 16) {
+                       *rx_shift = 16;
+                       *tx_shift = 16;
+               }
+       } else {
+               if (bits_per_word <= 8)
+                       *rx_shift = 8;
+       }
+}
+
 static int mspi_apply_cpu_mode_quirks(struct spi_mpc8xxx_cs *cs,
                                struct spi_device *spi,
                                struct mpc8xxx_spi *mpc8xxx_spi,
@@ -101,31 +120,20 @@ static int mspi_apply_cpu_mode_quirks(struct spi_mpc8xxx_cs *cs,
        if (bits_per_word <= 8) {
                cs->get_rx = mpc8xxx_spi_rx_buf_u8;
                cs->get_tx = mpc8xxx_spi_tx_buf_u8;
-               if (mpc8xxx_spi->flags & SPI_QE_CPU_MODE) {
-                       cs->rx_shift = 16;
-                       cs->tx_shift = 24;
-               }
        } else if (bits_per_word <= 16) {
                cs->get_rx = mpc8xxx_spi_rx_buf_u16;
                cs->get_tx = mpc8xxx_spi_tx_buf_u16;
-               if (mpc8xxx_spi->flags & SPI_QE_CPU_MODE) {
-                       cs->rx_shift = 16;
-                       cs->tx_shift = 16;
-               }
        } else if (bits_per_word <= 32) {
                cs->get_rx = mpc8xxx_spi_rx_buf_u32;
                cs->get_tx = mpc8xxx_spi_tx_buf_u32;
        } else
                return -EINVAL;
 
-       if (mpc8xxx_spi->flags & SPI_QE_CPU_MODE &&
-           spi->mode & SPI_LSB_FIRST) {
-               cs->tx_shift = 0;
-               if (bits_per_word <= 8)
-                       cs->rx_shift = 8;
-               else
-                       cs->rx_shift = 0;
-       }
+       if (mpc8xxx_spi->set_shifts)
+               mpc8xxx_spi->set_shifts(&cs->rx_shift, &cs->tx_shift,
+                                       bits_per_word,
+                                       !(spi->mode & SPI_LSB_FIRST));
+
        mpc8xxx_spi->rx_shift = cs->rx_shift;
        mpc8xxx_spi->tx_shift = cs->tx_shift;
        mpc8xxx_spi->get_rx = cs->get_rx;
@@ -487,10 +495,13 @@ static struct spi_master * fsl_spi_probe(struct device *dev,
        if (ret)
                goto err_cpm_init;
 
-       if (mpc8xxx_spi->flags & SPI_QE_CPU_MODE) {
-               mpc8xxx_spi->rx_shift = 16;
-               mpc8xxx_spi->tx_shift = 24;
-       }
+       if (mpc8xxx_spi->flags & SPI_QE_CPU_MODE)
+               mpc8xxx_spi->set_shifts = fsl_spi_qe_cpu_set_shifts;
+
+       if (mpc8xxx_spi->set_shifts)
+               /* 8 bits per word and MSB first */
+               mpc8xxx_spi->set_shifts(&mpc8xxx_spi->rx_shift,
+                                       &mpc8xxx_spi->tx_shift, 8, 1);
 
        mpc8xxx_spi->reg_base = ioremap(mem->start, resource_size(mem));
        if (mpc8xxx_spi->reg_base == NULL) {