projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/topic/drivers', 'spi/topic/dw', 'spi/topic/efm32...
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
Kconfig
diff --git
a/drivers/spi/Kconfig
b/drivers/spi/Kconfig
index
ba9310b
..
eea4eb8
100644
(file)
--- a/
drivers/spi/Kconfig
+++ b/
drivers/spi/Kconfig
@@
-150,7
+150,7
@@
config SPI_BUTTERFLY
config SPI_CLPS711X
tristate "CLPS711X host SPI controller"
config SPI_CLPS711X
tristate "CLPS711X host SPI controller"
- depends on ARCH_CLPS711X
+ depends on ARCH_CLPS711X
|| COMPILE_TEST
help
This enables dedicated general purpose SPI/Microwire1-compatible
master mode interface (SSI1) for CLPS711X-based CPUs.
help
This enables dedicated general purpose SPI/Microwire1-compatible
master mode interface (SSI1) for CLPS711X-based CPUs.
@@
-270,6
+270,7
@@
config SPI_FSL_SPI
config SPI_FSL_DSPI
tristate "Freescale DSPI controller"
select SPI_BITBANG
config SPI_FSL_DSPI
tristate "Freescale DSPI controller"
select SPI_BITBANG
+ select REGMAP_MMIO
depends on SOC_VF610 || COMPILE_TEST
help
This enables support for the Freescale DSPI controller in master
depends on SOC_VF610 || COMPILE_TEST
help
This enables support for the Freescale DSPI controller in master
@@
-376,10
+377,10
@@
config SPI_PXA2XX_PCI
def_tristate SPI_PXA2XX && PCI
config SPI_RSPI
def_tristate SPI_PXA2XX && PCI
config SPI_RSPI
- tristate "Renesas RSPI controller"
+ tristate "Renesas RSPI
/QSPI
controller"
depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE
help
depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE
help
- SPI driver for Renesas RSPI blocks.
+ SPI driver for Renesas RSPI
and QSPI
blocks.
config SPI_S3C24XX
tristate "Samsung S3C24XX series SPI"
config SPI_S3C24XX
tristate "Samsung S3C24XX series SPI"
@@
-546,7
+547,7
@@
config SPI_DW_MID_DMA
config SPI_DW_MMIO
tristate "Memory-mapped io interface driver for DW SPI core"
config SPI_DW_MMIO
tristate "Memory-mapped io interface driver for DW SPI core"
- depends on SPI_DESIGNWARE
&& HAVE_CLK
+ depends on SPI_DESIGNWARE
#
# There are lots of SPI device types, with sensors and memory
#
# There are lots of SPI device types, with sensors and memory