diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:53 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:48:53 -0400 |
| commit | afa8f0cd6c97379f4b6e5abb857e93efbcef799b (patch) | |
| tree | 885dc458d3ca421d1e8e2e09c270139a361abb66 /drivers/spi/Kconfig | |
| parent | 2f2613b028ed57cc17a5320ca88e608b218dd334 (diff) | |
| parent | d8851a0d4f57537315fdb854f04724acdc87c424 (diff) | |
Merge remote-tracking branch 'spi/topic/efm32' into spi-next
Diffstat (limited to 'drivers/spi/Kconfig')
| -rw-r--r-- | drivers/spi/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 718d08205bd3..8aad2c1dc33d 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
| @@ -164,6 +164,13 @@ config SPI_DAVINCI | |||
| 164 | help | 164 | help |
| 165 | SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules. | 165 | SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules. |
| 166 | 166 | ||
| 167 | config SPI_EFM32 | ||
| 168 | tristate "EFM32 SPI controller" | ||
| 169 | depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST) | ||
| 170 | select SPI_BITBANG | ||
| 171 | help | ||
| 172 | Driver for the spi controller found on Energy Micro's EFM32 SoCs. | ||
| 173 | |||
| 167 | config SPI_EP93XX | 174 | config SPI_EP93XX |
| 168 | tristate "Cirrus Logic EP93xx SPI controller" | 175 | tristate "Cirrus Logic EP93xx SPI controller" |
| 169 | depends on ARCH_EP93XX || COMPILE_TEST | 176 | depends on ARCH_EP93XX || COMPILE_TEST |