Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rb4xx', 'spi/topic/rspi...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 198f96b7fb45dab78845ba1fcde123ea680e2082..ec40a27a4b7642ad4ce489d9daa760f8b69dfe62 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -77,7 +77,9 @@ config SPI_ATMEL
 
 config SPI_BCM2835
        tristate "BCM2835 SPI controller"
 
 config SPI_BCM2835
        tristate "BCM2835 SPI controller"

+       depends on GPIOLIB

        depends on ARCH_BCM2835 || COMPILE_TEST
        depends on ARCH_BCM2835 || COMPILE_TEST

+       depends on GPIOLIB

        help
          This selects a driver for the Broadcom BCM2835 SPI master.
 
        help
          This selects a driver for the Broadcom BCM2835 SPI master.
 


@@ -220,7 +222,7 @@ config SPI_FALCON
 
 config SPI_GPIO
        tristate "GPIO-based bitbanging SPI Master"
 
 config SPI_GPIO
        tristate "GPIO-based bitbanging SPI Master"

-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST

        select SPI_BITBANG
        help
          This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
        select SPI_BITBANG
        help
          This simple GPIO bitbanging SPI master uses the arch-neutral GPIO


@@ -302,7 +304,7 @@ config SPI_FSL_SPI
 config SPI_FSL_DSPI
        tristate "Freescale DSPI controller"
        select REGMAP_MMIO
 config SPI_FSL_DSPI
        tristate "Freescale DSPI controller"
        select REGMAP_MMIO

-       depends on SOC_VF610 || COMPILE_TEST
+       depends on SOC_VF610 || SOC_LS1021A || COMPILE_TEST

        help
          This enables support for the Freescale DSPI controller in master
          mode. VF610 platform uses the controller.
        help
          This enables support for the Freescale DSPI controller in master
          mode. VF610 platform uses the controller.


@@ -326,7 +328,7 @@ config SPI_MESON_SPIFC
 
 config SPI_OC_TINY
        tristate "OpenCores tiny SPI"
 
 config SPI_OC_TINY
        tristate "OpenCores tiny SPI"

-       depends on GPIOLIB
+       depends on GPIOLIB || COMPILE_TEST

        select SPI_BITBANG
        help
          This is the driver for OpenCores tiny SPI master controller.
        select SPI_BITBANG
        help
          This is the driver for OpenCores tiny SPI master controller.


@@ -393,16 +395,9 @@ config SPI_PPC4xx
        help
          This selects a driver for the PPC4xx SPI Controller.
 
        help
          This selects a driver for the PPC4xx SPI Controller.
 

-config SPI_PXA2XX_PXADMA
-       bool "PXA2xx SSP legacy PXA DMA API support"
-       depends on SPI_PXA2XX && ARCH_PXA
-       help
-         Enable PXA private legacy DMA API support. Note that this is
-         deprecated in favor of generic DMA engine API.
-

 config SPI_PXA2XX_DMA
        def_bool y
 config SPI_PXA2XX_DMA
        def_bool y

-       depends on SPI_PXA2XX && !SPI_PXA2XX_PXADMA
+       depends on SPI_PXA2XX

 
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
 
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"


@@ -428,6 +423,12 @@ config SPI_ROCKCHIP
          The main usecase of this controller is to use spi flash as boot
          device.
 
          The main usecase of this controller is to use spi flash as boot
          device.
 

+config SPI_RB4XX
+       tristate "Mikrotik RB4XX SPI master"
+       depends on SPI_MASTER && ATH79
+       help
+         SPI controller driver for the Mikrotik RB4xx series boards.
+

 config SPI_RSPI
        tristate "Renesas RSPI/QSPI controller"
        depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
 config SPI_RSPI
        tristate "Renesas RSPI/QSPI controller"
        depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST