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

diff --cc drivers/spi/Kconfig
index 718d08205bd3cebec6231f1cb1eeb61309992f2c,f84a77c816bc539eae7624daa4b8deeb287c9709..8aad2c1dc33d64d6eed10b550fab5b184532a290
--- 1/drivers/spi/Kconfig
--- 2/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.

diff --cc drivers/spi/Makefile
Simple merge