From: Mark Brown <broonie@linaro.org>
Date: Sun, 1 Sep 2013 12:49:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/qspi' into spi-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=85cac431329bd09f7d30d489591d7af0d658b008;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

85cac431329bd09f7d30d489591d7af0d658b008
diff --cc drivers/spi/Kconfig
index 8aad2c1dc33d,72dee132b6cb..f552c89abdd4
--- a/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/spi.c
index 7ed5c147c073,76e6ddf00ccc..6ef349f82b5f
--- a/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) {