Merge remote-tracking branch 'spi/topic/qspi' into spi-next

diff --cc drivers/spi/Kconfig
index 8aad2c1dc33d64d6eed10b550fab5b184532a290,72dee132b6cbbdc5777afa6dddd7a6828fd49917..f552c89abdd466da510b472fd613c47b2c1aefe1
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -306,9 -285,17 +306,17 @@@ config SPI_OMAP24X
          SPI master controller for OMAP24XX and later Multichannel SPI
          (McSPI) modules.
  
+ config SPI_TI_QSPI
+       tristate "DRA7xxx QSPI controller support"
+       depends on ARCH_OMAP2PLUS || COMPILE_TEST
+       help
+         QSPI master controller for DRA7xxx used for flash devices.
+         This device supports single, dual and quad read support, while
+         it only supports single write mode.
+ 
  config SPI_OMAP_100K
        tristate "OMAP SPI 100K"
 -      depends on ARCH_OMAP850 || ARCH_OMAP730
 +      depends on ARCH_OMAP850 || ARCH_OMAP730 || COMPILE_TEST
        help
          OMAP SPI 100K master controller for omap7xx boards.
  

diff --cc drivers/spi/Makefile
Simple merge

diff --cc drivers/spi/spi-bcm63xx.c
Simple merge

diff --cc drivers/spi/spi-coldfire-qspi.c
Simple merge

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge

diff --cc drivers/spi/spi-pl022.c
Simple merge

diff --cc drivers/spi/spi-pxa2xx.c
Simple merge

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge

diff --cc drivers/spi/spi.c
index 7ed5c147c073c7c7fbcbfef1fb15529727999598,76e6ddf00ccc4b90f0a7001f5ce78ca1c7282413..6ef349f82b5f3624db4c9511b29c1ea125227a70
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -1378,9 -1452,10 +1452,11 @@@ static int __spi_async(struct spi_devic
        /**
         * Set transfer bits_per_word and max speed as spi device default if
         * it is not set for this transfer.
+        * Set transfer tx_nbits and rx_nbits as single transfer default
+        * (SPI_NBITS_SINGLE) if it is not set for this transfer.
         */
        list_for_each_entry(xfer, &message->transfers, transfer_list) {
 +              message->frame_length += xfer->len;
                if (!xfer->bits_per_word)
                        xfer->bits_per_word = spi->bits_per_word;
                if (!xfer->speed_hz) {

diff --cc include/linux/spi/spi.h
Simple merge