Merge branch 'linus' into cpus4096

[mv-sheeva.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index aaaea81e412aa81abe5f2f1ced1b89152044c4a3..66ec5d8808de83c5393fd0d35fb0d6352bc24161 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -5,11 +5,9 @@
 # nobody's needed a slave side API yet.  The master-role API is not
 # fully appropriate there, so it'd need some thought to do well.
 #
 # nobody's needed a slave side API yet.  The master-role API is not
 # fully appropriate there, so it'd need some thought to do well.
 #

-menu "SPI support"
-       depends on HAS_IOMEM
-
-config SPI
+menuconfig SPI

        bool "SPI support"
        bool "SPI support"

+       depends on HAS_IOMEM

        help
          The "Serial Peripheral Interface" is a low level synchronous
          protocol.  Chips that support SPI can have data transfer rates
        help
          The "Serial Peripheral Interface" is a low level synchronous
          protocol.  Chips that support SPI can have data transfer rates


@@ -28,9 +26,11 @@ config SPI
          (half duplex), SSP, SSI, and PSP.  This driver framework should
          work with most such devices and controllers.
 
          (half duplex), SSP, SSI, and PSP.  This driver framework should
          work with most such devices and controllers.
 

+if SPI
+

 config SPI_DEBUG
        boolean "Debug support for SPI drivers"
 config SPI_DEBUG
        boolean "Debug support for SPI drivers"

-       depends on SPI && DEBUG_KERNEL
+       depends on DEBUG_KERNEL

        help
          Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
          sysfs, and debugfs support in SPI controller and protocol drivers.
        help
          Say "yes" to enable debug messaging (like dev_dbg and pr_debug),
          sysfs, and debugfs support in SPI controller and protocol drivers.


@@ -126,7 +126,6 @@ config SPI_MPC52xx_PSC
 config SPI_MPC83xx
        tristate "Freescale MPC83xx/QUICC Engine SPI controller"
        depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL
 config SPI_MPC83xx
        tristate "Freescale MPC83xx/QUICC Engine SPI controller"
        depends on SPI_MASTER && (PPC_83xx || QUICC_ENGINE) && EXPERIMENTAL

-       select SPI_BITBANG

        help
          This enables using the Freescale MPC83xx and QUICC Engine SPI
          controllers in master mode.
        help
          This enables using the Freescale MPC83xx and QUICC Engine SPI
          controllers in master mode.


@@ -144,10 +143,10 @@ config SPI_OMAP_UWIRE
          This hooks up to the MicroWire controller on OMAP1 chips.
 
 config SPI_OMAP24XX
          This hooks up to the MicroWire controller on OMAP1 chips.
 
 config SPI_OMAP24XX

-       tristate "McSPI driver for OMAP24xx"
-       depends on SPI_MASTER && ARCH_OMAP24XX
+       tristate "McSPI driver for OMAP24xx/OMAP34xx"
+       depends on SPI_MASTER && (ARCH_OMAP24XX || ARCH_OMAP34XX)

        help
        help

-         SPI master controller for OMAP24xx Multichannel SPI
+         SPI master controller for OMAP24xx/OMAP34xx Multichannel SPI

          (McSPI) modules.
 
 config SPI_PXA2XX
          (McSPI) modules.
 
 config SPI_PXA2XX


@@ -176,6 +175,13 @@ config SPI_S3C24XX_GPIO
          the inbuilt hardware cannot provide the transfer mode, or
          where the board is using non hardware connected pins.
 
          the inbuilt hardware cannot provide the transfer mode, or
          where the board is using non hardware connected pins.
 

+config SPI_SH_SCI
+       tristate "SuperH SCI SPI controller"
+       depends on SPI_MASTER && SUPERH
+       select SPI_BITBANG
+       help
+         SPI driver for SuperH SCI blocks.
+

 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
        depends on SPI_MASTER && GENERIC_GPIO && CPU_TX49XX
 config SPI_TXX9
        tristate "Toshiba TXx9 SPI controller"
        depends on SPI_MASTER && GENERIC_GPIO && CPU_TX49XX


@@ -238,5 +244,4 @@ config SPI_TLE62X0
 
 # (slave support would go here)
 
 
 # (slave support would go here)
 

-endmenu # "SPI support"
-
+endif # SPI