Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi into next

[platform/kernel/u-boot.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index dccd5ea..09b9cb1 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -119,6 +119,12 @@ config CF_SPI
           Enable the ColdFire SPI driver. This driver can be used on
           some m68k SoCs.
 
+config DAVINCI_SPI
+       bool "Davinci & Keystone SPI driver"
+       depends on ARCH_DAVINCI || ARCH_KEYSTONE
+       help
+         Enable the Davinci SPI driver
+
 config DESIGNWARE_SPI
        bool "Designware SPI driver"
        help
@@ -141,6 +147,14 @@ config FSL_DSPI
          this Freescale DSPI IP core. LS102xA and Colibri VF50/VF61 platforms
          use this driver.
 
+config FSL_QSPI
+       bool "Freescale QSPI driver"
+       imply SPI_FLASH_BAR
+       help
+         Enable the Freescale Quad-SPI (QSPI) driver. This driver can be
+         used to access the SPI NOR flash on platforms embedding this
+         Freescale IP core.
+
 config ICH_SPI
        bool "Intel ICH SPI driver"
        help
@@ -167,6 +181,13 @@ config MPC8XXX_SPI
        help
          Enable support for SPI on the MPC8XXX PowerPC SoCs.
 
+config MSCC_BB_SPI
+       bool "MSCC bitbang SPI driver"
+       depends on SOC_VCOREIII
+       help
+         Enable MSCC bitbang SPI driver. This driver can be used on
+         MSCC SOCs.
+
 config MT7621_SPI
        bool "MediaTek MT7621 SPI driver"
        depends on SOC_MT7628
@@ -192,6 +213,12 @@ config MVEBU_A3700_SPI
          used to access the SPI NOR flash on platforms embedding this
          Marvell IP core.
 
+config MXS_SPI
+       bool "MXS SPI Driver"
+       help
+         Enable the MXS SPI controller driver. This driver can be used
+         on the i.MX23 and i.MX28 SoCs.
+
 config NXP_FSPI
        bool "NXP FlexSPI driver"
        depends on SPI_MEM
@@ -265,6 +292,12 @@ config SPI_SIFIVE
 
          The SiFive SPI controller driver is found on various SiFive SoCs.
 
+config SOFT_SPI
+       bool "Soft SPI driver"
+       help
+        Enable Soft SPI driver. This driver is to use GPIO simulate
+        the SPI protocol.
+
 config SPI_SUNXI
        bool "Allwinner SoC SPI controllers"
        default ARCH_SUNXI
@@ -370,26 +403,6 @@ config ZYNQMP_GQSPI
 
 endif # if DM_SPI
 
-config SOFT_SPI
-       bool "Soft SPI driver"
-       depends on DM_SPI || (DEPRECATED && !DM_SPI)
-       help
-        Enable Soft SPI driver. This driver is to use GPIO simulate
-        the SPI protocol.
-
-config MSCC_BB_SPI
-       bool "MSCC bitbang SPI driver"
-       depends on SOC_VCOREIII
-       help
-         Enable MSCC bitbang SPI driver. This driver can be used on
-         MSCC SOCs.
-
-config CF_SPI
-       bool "ColdFire SPI driver"
-       help
-         Enable the ColdFire SPI driver. This driver can be used on
-         some m68k SoCs.
-
 config FSL_ESPI
        bool "Freescale eSPI driver"
        imply SPI_FLASH_BAR
@@ -398,27 +411,6 @@ config FSL_ESPI
          access the SPI interface and SPI NOR flash on platforms embedding
          this Freescale eSPI IP core.
 
-config FSL_QSPI
-       bool "Freescale QSPI driver"
-       imply SPI_FLASH_BAR
-       help
-         Enable the Freescale Quad-SPI (QSPI) driver. This driver can be
-         used to access the SPI NOR flash on platforms embedding this
-         Freescale IP core.
-
-config DAVINCI_SPI
-       bool "Davinci & Keystone SPI driver"
-       depends on ARCH_DAVINCI || ARCH_KEYSTONE
-       help
-         Enable the Davinci SPI driver
-
-config SH_SPI
-       bool "SuperH SPI driver"
-       depends on DEPRECATED
-       help
-         Enable the SuperH SPI controller driver. This driver can be used
-         on various SuperH SoCs, such as SH7757.
-
 config SH_QSPI
        bool "Renesas Quad SPI driver"
        help
@@ -437,12 +429,6 @@ config MXC_SPI
          Enable the MXC SPI controller driver. This driver can be used
          on various i.MX SoCs such as i.MX31/35/51/6/7.
 
-config MXS_SPI
-       bool "MXS SPI Driver"
-       help
-         Enable the MXS SPI controller driver. This driver can be used
-         on the i.MX23 and i.MX28 SoCs.
-
 config OMAP3_SPI
        bool "McSPI driver for OMAP"
        help