1 files changed, 5 insertions, 18 deletions

diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 3f3c08c6ba4e..d949dbf1141f 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -1185,9 +1185,6 @@ static int transfer(struct spi_device *spi, struct spi_message *msg)
         return 0;
 }
 
-/* the spi->mode bits understood by this driver: */
-#define MODEBITS (SPI_CPOL | SPI_CPHA)
-
 static int setup_cs(struct spi_device *spi, struct chip_data *chip,
                     struct pxa2xx_spi_chip *chip_info)
 {
@@ -1236,9 +1233,6 @@ static int setup(struct spi_device *spi)
         uint tx_thres = TX_THRESH_DFLT;
         uint rx_thres = RX_THRESH_DFLT;
 
-        if (!spi->bits_per_word)
-                spi->bits_per_word = 8;
-
         if (drv_data->ssp_type != PXA25x_SSP
                 && (spi->bits_per_word < 4 || spi->bits_per_word > 32)) {
                 dev_err(&spi->dev, "failed setup: ssp_type=%d, bits/wrd=%d "
@@ -1255,12 +1249,6 @@ static int setup(struct spi_device *spi)
                 return -EINVAL;
         }
 
-        if (spi->mode & ~MODEBITS) {
-                dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",
-                        spi->mode & ~MODEBITS);
-                return -EINVAL;
-        }
-
         /* Only alloc on first setup */
         chip = spi_get_ctldata(spi);
         if (!chip) {
@@ -1328,18 +1316,14 @@ static int setup(struct spi_device *spi)
 
         /* NOTE:  PXA25x_SSP _could_ use external clocking ... */
         if (drv_data->ssp_type != PXA25x_SSP)
-                dev_dbg(&spi->dev, "%d bits/word, %ld Hz, mode %d, %s\n",
-                                spi->bits_per_word,
+                dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
                                 clk_get_rate(ssp->clk)
                                         / (1 + ((chip->cr0 & SSCR0_SCR) >> 8)),
-                                spi->mode & 0x3,
                                 chip->enable_dma ? "DMA" : "PIO");
         else
-                dev_dbg(&spi->dev, "%d bits/word, %ld Hz, mode %d, %s\n",
-                                spi->bits_per_word,
+                dev_dbg(&spi->dev, "%ld Hz actual, %s\n",
                                 clk_get_rate(ssp->clk) / 2
                                         / (1 + ((chip->cr0 & SSCR0_SCR) >> 8)),
-                                spi->mode & 0x3,
                                 chip->enable_dma ? "DMA" : "PIO");
 
         if (spi->bits_per_word <= 8) {
@@ -1500,6 +1484,9 @@ static int __init pxa2xx_spi_probe(struct platform_device *pdev)
         drv_data->pdev = pdev;
         drv_data->ssp = ssp;
 
+        /* the spi->mode bits understood by this driver: */
+        master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
+
         master->bus_num = pdev->id;
         master->num_chipselect = platform_info->num_chipselect;
         master->dma_alignment = DMA_ALIGNMENT;