diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:06 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:49:06 -0400 |
commit | 85cac431329bd09f7d30d489591d7af0d658b008 (patch) | |
tree | 8e81e687c9104c297b9d985e2c5f37f05a6e4b83 /drivers/spi/Kconfig | |
parent | 793b3cb6acc081e557dabcf11ce781d64dafb4d4 (diff) | |
parent | b6460366fbadc160604f50047d0394c7fc39ceab (diff) |
Merge remote-tracking branch 'spi/topic/qspi' into spi-next
Diffstat (limited to 'drivers/spi/Kconfig')
-rw-r--r-- | drivers/spi/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 8aad2c1dc33d..f552c89abdd4 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -306,6 +306,14 @@ config SPI_OMAP24XX | |||
306 | SPI master controller for OMAP24XX and later Multichannel SPI | 306 | SPI master controller for OMAP24XX and later Multichannel SPI |
307 | (McSPI) modules. | 307 | (McSPI) modules. |
308 | 308 | ||
309 | config SPI_TI_QSPI | ||
310 | tristate "DRA7xxx QSPI controller support" | ||
311 | depends on ARCH_OMAP2PLUS || COMPILE_TEST | ||
312 | help | ||
313 | QSPI master controller for DRA7xxx used for flash devices. | ||
314 | This device supports single, dual and quad read support, while | ||
315 | it only supports single write mode. | ||
316 | |||
309 | config SPI_OMAP_100K | 317 | config SPI_OMAP_100K |
310 | tristate "OMAP SPI 100K" | 318 | tristate "OMAP SPI 100K" |
311 | depends on ARCH_OMAP850 || ARCH_OMAP730 || COMPILE_TEST | 319 | depends on ARCH_OMAP850 || ARCH_OMAP730 || COMPILE_TEST |