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 tag 'drm-next-2019-11-27' of git://anongit.freedesktop.org/drm/drm
[linux-2.6-microblaze.git]
/
drivers
/
spi
/
Kconfig
diff --git
a/drivers/spi/Kconfig
b/drivers/spi/Kconfig
index
6f7fdcb
..
870f779
100644
(file)
--- a/
drivers/spi/Kconfig
+++ b/
drivers/spi/Kconfig
@@
-80,6
+80,7
@@
config SPI_ARMADA_3700
config SPI_ATMEL
tristate "Atmel SPI Controller"
depends on ARCH_AT91 || COMPILE_TEST
config SPI_ATMEL
tristate "Atmel SPI Controller"
depends on ARCH_AT91 || COMPILE_TEST
+ depends on OF
help
This selects a driver for the Atmel SPI Controller, present on
many AT91 ARM chips.
help
This selects a driver for the Atmel SPI Controller, present on
many AT91 ARM chips.
@@
-143,7
+144,7
@@
config SPI_BCM63XX
tristate "Broadcom BCM63xx SPI controller"
depends on BCM63XX || COMPILE_TEST
help
tristate "Broadcom BCM63xx SPI controller"
depends on BCM63XX || COMPILE_TEST
help
-
Enable support for the SPI controller on the Broadcom BCM63xx SoCs.
+ Enable support for the SPI controller on the Broadcom BCM63xx SoCs.
config SPI_BCM63XX_HSSPI
tristate "Broadcom BCM63XX HS SPI controller driver"
config SPI_BCM63XX_HSSPI
tristate "Broadcom BCM63XX HS SPI controller driver"
@@
-234,11
+235,11
@@
config SPI_DLN2
tristate "Diolan DLN-2 USB SPI adapter"
depends on MFD_DLN2
help
tristate "Diolan DLN-2 USB SPI adapter"
depends on MFD_DLN2
help
-
If you say yes to this option, support will be included for Diolan
-
DLN2, a USB to SPI interface.
+ If you say yes to this option, support will be included for Diolan
+ DLN2, a USB to SPI interface.
-
This driver can also be built as a module. If so, the module
-
will be called spi-dln2.
+ This driver can also be built as a module. If so, the module
+ will be called spi-dln2.
config SPI_EFM32
tristate "EFM32 SPI controller"
config SPI_EFM32
tristate "EFM32 SPI controller"
@@
-747,10
+748,10
@@
config SPI_SYNQUACER
It also supports the new dual-bit and quad-bit SPI protocol.
config SPI_MXIC
It also supports the new dual-bit and quad-bit SPI protocol.
config SPI_MXIC
-
tristate "Macronix MX25F0A SPI controller"
-
depends on SPI_MASTER
-
help
-
This selects the Macronix MX25F0A SPI controller driver.
+ tristate "Macronix MX25F0A SPI controller"
+ depends on SPI_MASTER
+ help
+ This selects the Macronix MX25F0A SPI controller driver.
config SPI_MXS
tristate "Freescale MXS SPI controller"
config SPI_MXS
tristate "Freescale MXS SPI controller"