Merge remote-tracking branches 'spi/topic/omap-uwire', 'spi/topic/omap100k', 'spi...

diff --cc drivers/spi/Kconfig
index 5bf7a4f100d218e9050a0e1c8bc5dc7c4f7a38d9,ba9310bc9acb7449a91ccb59b8f7de5c09c5801d,ba9310bc9acb7449a91ccb59b8f7de5c09c5801d,205dbfe97e55ec82b678128731a186f885857de9,ba9310bc9acb7449a91ccb59b8f7de5c09c5801d,581ee2a8856b157641eb5a6b2c13389241b4ea90,082acbdef1bd9627d92661a83ddea20e51e65aee,5072b71baf5e8424ce5c5bba63d9367d73952177,ba9310bc9acb7449a91ccb59b8f7de5c09c5801d..5dea67c798d5b0e4b4a4967d397d3eb77b57724e
--- 1/drivers/spi/Kconfig
--- 2/drivers/spi/Kconfig
--- 3/drivers/spi/Kconfig
--- 4/drivers/spi/Kconfig
--- 5/drivers/spi/Kconfig
--- 6/drivers/spi/Kconfig
--- 7/drivers/spi/Kconfig
--- 8/drivers/spi/Kconfig
--- 9/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@@@@@ -376,11 -376,11 -376,11 -376,11 -376,11 -376,11 -376,24 -376,11 -376,11 +376,24 @@@@@@@@@@ config SPI_PXA2XX_PC
                def_tristate SPI_PXA2XX && PCI
         
         config SPI_RSPI
 ---- ---       tristate "Renesas RSPI controller"
 ++++ +++       tristate "Renesas RSPI/QSPI controller"
                depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE
                help
 ---- ---         SPI driver for Renesas RSPI blocks.
 ++++ +++         SPI driver for Renesas RSPI and QSPI blocks.
 ++++  ++
++++++ ++config SPI_QUP
++++++ ++       tristate "Qualcomm SPI controller with QUP interface"
++++++ ++       depends on ARCH_MSM_DT || (ARM && COMPILE_TEST)
++++++ ++       help
++++++ ++         Qualcomm Universal Peripheral (QUP) core is an AHB slave that
++++++ ++         provides a common data path (an output FIFO and an input FIFO)
++++++ ++         for serial peripheral interface (SPI) mini-core. SPI in master
++++++ ++         mode supports up to 50MHz, up to four chip selects, programmable
++++++ ++         data path from 4 bits to 32 bits and numerous protocol variants.
++++++ ++
++++++ ++         This driver can also be built as a module.  If so, the module
++++++ ++         will be called spi_qup.
+    +   
         config SPI_S3C24XX
                tristate "Samsung S3C24XX series SPI"
                depends on ARCH_S3C24XX

diff --cc drivers/spi/spi-omap-uwire.c
index 8062909b9f5e65d564e413e21159f1403ee42806,31ce92ff738b26a1cf1391553050a6944720d925,9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d,9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d,9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d,9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d,9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d,9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d,9313fd3b413dfd6eed5e1d8e14dc42a0e32f1e3d..be2a2e108e2fc29878d5266fb5fdbcfd43bae357
--- 1/drivers/spi/spi-omap-uwire.c
--- 2/drivers/spi/spi-omap-uwire.c
--- 3/drivers/spi/spi-omap-uwire.c
--- 4/drivers/spi/spi-omap-uwire.c
--- 5/drivers/spi/spi-omap-uwire.c
--- 6/drivers/spi/spi-omap-uwire.c
--- 7/drivers/spi/spi-omap-uwire.c
--- 8/drivers/spi/spi-omap-uwire.c
--- 9/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@@@@@@@@@ -332,17 -325,6 -332,23 -332,23 -332,23 -332,23 -332,23 -332,23 -332,23 +325,6 @@@@@@@@@@ static int uwire_setup_transfer(struct 
         
                uwire = spi_master_get_devdata(spi->master);
         
  -------       if (spi->chip_select > 3) {
  -------               pr_debug("%s: cs%d?\n", dev_name(&spi->dev), spi->chip_select);
  -------               status = -ENODEV;
  -------               goto done;
  -------       }
  -------
- -------       bits = spi->bits_per_word;
- -------       if (t != NULL && t->bits_per_word)
- -------               bits = t->bits_per_word;
- -------
- -------       if (bits > 16) {
- -------               pr_debug("%s: wordsize %d?\n", dev_name(&spi->dev), bits);
- -------               status = -ENODEV;
- -------               goto done;
- -------       }
- -------       ust->bits_per_word = bits;
- -------
                /* mode 0..3, clock inverted separately;
                 * standard nCS signaling;
                 * don't treat DI=high as "not ready"

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

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

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

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