Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-spi

[oweals/u-boot.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index c3a829deaec61fafe152235a722674e8e60b35c1..8dd3213d485b492139fa8cc310255e7b0ac057a6 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -49,6 +49,14 @@ config ATH79_SPI
          uses driver model and requires a device tree binding to operate.
          please refer to doc/device-tree-bindings/spi/spi-ath79.txt.
 
+config ATMEL_QSPI
+       bool "Atmel Quad SPI Controller"
+       depends on ARCH_AT91
+       help
+         Enable the Atmel Quad SPI controller in master mode. This driver
+         does not support generic SPI. The implementation supports only the
+         spi-mem interface.
+
 config ATMEL_SPI
        bool "Atmel SPI driver"
        default y if ARCH_AT91
@@ -87,6 +95,12 @@ config CADENCE_QSPI
          used to access the SPI NOR flash on platforms embedding this
          Cadence IP core.
 
+config CF_SPI
+        bool "ColdFire SPI driver"
+        help
+          Enable the ColdFire SPI driver. This driver can be used on
+          some m68k SoCs.
+
 config DESIGNWARE_SPI
        bool "Designware SPI driver"
        help
@@ -131,6 +145,11 @@ config MPC8XX_SPI
        help
          Enable support for SPI on MPC8XX
 
+config MPC8XXX_SPI
+       bool "MPC8XXX SPI Driver"
+       help
+         Enable support for SPI on the MPC8XXX PowerPC SoCs.
+
 config MT7621_SPI
        bool "MediaTek MT7621 SPI driver"
        depends on SOC_MT7628
@@ -139,13 +158,14 @@ config MT7621_SPI
          the SPI NOR flash on platforms embedding this Ralink / MediaTek
          SPI core, like MT7621/7628/7688.
 
-config MTK_QSPI
-       bool "Mediatek QSPI driver"
-       imply SPI_FLASH_BAR
+config MTK_SNFI_SPI
+       bool "Mediatek SPI memory controller driver"
+       depends on SPI_MEM
        help
-         Enable the Mediatek QSPI driver. This driver can be
-         used to access the SPI NOR flash on platforms embedding this
-         Mediatek QSPI IP core.
+         Enable the Mediatek SPI memory controller driver. This driver is
+         originally based on the MediaTek SNFI IP core. It can only be
+         used to access SPI memory devices like SPI-NOR or SPI-NAND on
+         platforms embedding this IP core, like MT7622/M7629.
 
 config MVEBU_A3700_SPI
        bool "Marvell Armada 3700 SPI driver"
@@ -207,12 +227,20 @@ config SANDBOX_SPI
                cs-gpios = <0>, <&gpio_a 0>;
                flash@0 {
                        reg = <0>;
-                       compatible = "spansion,m25p16", "sandbox,spi-flash";
+                       compatible = "spansion,m25p16", "jedec,spi-nor";
                        spi-max-frequency = <40000000>;
                        sandbox,filename = "spi.bin";
                };
          };
 
+config SPI_SIFIVE
+       bool "SiFive SPI driver"
+       help
+         This driver supports the SiFive SPI IP. If unsure say N.
+         Enable the SiFive SPI controller driver.
+
+         The SiFive SPI controller driver is found on various SiFive SoCs.
+
 config SPI_SUNXI
        bool "Allwinner SoC SPI controllers"
        help
@@ -228,6 +256,14 @@ config STM32_QSPI
          used to access the SPI NOR flash chips on platforms embedding
          this ST IP core.
 
+config STM32_SPI
+       bool "STM32 SPI driver"
+       depends on ARCH_STM32MP
+       help
+         Enable the STM32 Serial Peripheral Interface (SPI) driver for STM32MP
+         SoCs. This uses driver model and requires a device tree binding to
+         operate.
+
 config TEGRA114_SPI
        bool "nVidia Tegra114 SPI driver"
        help
@@ -266,6 +302,14 @@ config TI_QSPI
          Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
          This driver support spi flash single, quad and memory reads.
 
+config UNIPHIER_SPI
+       bool "Socionext UniPhier SPI driver"
+       depends on ARCH_UNIPHIER
+       help
+         Enable the Socionext UniPhier SPI driver. This driver can
+         be used to access SPI chips on platforms embedding this
+         UniPhier IP core.
+
 config XILINX_SPI
        bool "Xilinx SPI driver"
        help
@@ -303,6 +347,7 @@ 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.
@@ -343,6 +388,7 @@ config DAVINCI_SPI
 
 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.
@@ -361,14 +407,10 @@ config KIRKWOOD_SPI
 
 config LPC32XX_SSP
        bool "LPC32XX SPI Driver"
+       depends on DEPRECATED
        help
          Enable support for SPI on LPC32xx
 
-config MPC8XXX_SPI
-       bool "MPC8XXX SPI Driver"
-       help
-         Enable support for SPI on the MPC8XXX PowerPC SoCs.
-
 config MXC_SPI
        bool "MXC SPI Driver"
        help