From: Mark Brown <broonie@linaro.org>
Date: Mon, 4 Aug 2014 16:21:12 +0000 (+0100)
Subject: Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pl022', 'spi/topic/qup... 
X-Git-Tag: firefly_0821_release~176^2~3482^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0c18b7638a11af1a7b6727162f1a4a362d4ac7bf;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pl022', 'spi/topic/qup', 'spi/topic/rockchip' and 'spi/topic/rspi' into spi-next
---

0c18b7638a11af1a7b6727162f1a4a362d4ac7bf
diff --cc drivers/spi/Kconfig
index 213b5cbb9dcc,213b5cbb9dcc,213b5cbb9dcc,213b5cbb9dcc,79ace88030c4,29630a99fecd..20bd055ea2d1
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@@@@@ -382,9 -382,9 -382,9 -382,9 -382,21 -382,9 +382,21 @@@@@@@ config SPI_PXA2X
      config SPI_PXA2XX_PCI
      	def_tristate SPI_PXA2XX && PCI
      
++++ +config SPI_ROCKCHIP
++++ +	tristate "Rockchip SPI controller driver"
++++ +	depends on ARM || ARM64 || AVR32 || HEXAGON || MIPS || SUPERH
++++ +	help
++++ +	  This selects a driver for Rockchip SPI controller.
++++ +
++++ +	  If you say yes to this option, support will be included for
++++ +	  RK3066, RK3188 and RK3288 families of SPI controller.
++++ +	  Rockchip SPI controller support DMA transport and PIO mode.
++++ +	  The main usecase of this controller is to use spi flash as boot
++++ +	  device.
++++ +
      config SPI_RSPI
      	tristate "Renesas RSPI/QSPI controller"
----- 	depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE
+++++ 	depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
      	help
      	  SPI driver for Renesas RSPI and QSPI blocks.