From: Mark Brown <broonie@linaro.org>
Date: Sun, 1 Sep 2013 12:48:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/efm32' into spi-next
X-Git-Tag: v3.12-rc1~192^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afa8f0cd6c97379f4b6e5abb857e93efbcef799b;p=thirdparty%2Fkernel%2Fstable.git

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

afa8f0cd6c97379f4b6e5abb857e93efbcef799b
diff --cc drivers/spi/Kconfig
index 718d08205bd3c,f84a77c816bc5..8aad2c1dc33d6
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@@ -164,9 -157,16 +164,16 @@@ config SPI_DAVINC
  	help
  	  SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.
  
+ config SPI_EFM32
+ 	tristate "EFM32 SPI controller"
+ 	depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
+ 	select SPI_BITBANG
+ 	help
+ 	  Driver for the spi controller found on Energy Micro's EFM32 SoCs.
+ 
  config SPI_EP93XX
  	tristate "Cirrus Logic EP93xx SPI controller"
 -	depends on ARCH_EP93XX
 +	depends on ARCH_EP93XX || COMPILE_TEST
  	help
  	  This enables using the Cirrus EP93xx SPI controller in master
  	  mode.