spi: Kconfig: Show dm-spi drivers if DM_SPI set

DM supported spi drivers are enbled only when DM_SPI enabled,
so added DM_SPI if condition in Kconfig to show thoese only
when it enabled.

Also re-order the config items as incresing alphabetic order.

Signed-off-by: Jagan Teki <jteki@openedev.com>

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index d16e298f8f4172a9dd7e1e57f33c20b83794f3a4..dab80d573612c1401479f75afc3ff541138ac6a2 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -16,6 +16,22 @@ config DM_SPI
          typically use driver-private data instead of extending the
          spi_slave structure.
 
+if DM_SPI
+
+config CADENCE_QSPI
+       bool "Cadence QSPI driver"
+       help
+         Enable the Cadence Quad-SPI (QSPI) driver. This driver can be
+         used to access the SPI NOR flash on platforms embedding this
+         Cadence IP core.
+
+config DESIGNWARE_SPI
+       bool "Designware SPI driver"
+       help
+         Enable the Designware SPI driver. This driver can be used to
+         access the SPI NOR flash on platforms embedding this Designware
+         IP core.
+
 config SANDBOX_SPI
        bool "Sandbox SPI driver"
        depends on SANDBOX && DM
@@ -39,33 +55,10 @@ config SANDBOX_SPI
                        spi-max-frequency = <40000000>;
                        sandbox,filename = "spi.bin";
                };
-       };
-
-config DESIGNWARE_SPI
-       bool "Designware SPI driver"
-       depends on DM_SPI
-       help
-         Enable the Designware SPI driver. This driver can be used to
-         access the SPI NOR flash on platforms embedding this Designware
-         IP core.
-
-config CADENCE_QSPI
-       bool "Cadence QSPI driver"
-       depends on DM_SPI
-       help
-         Enable the Cadence Quad-SPI (QSPI) driver. This driver can be
-         used to access the SPI NOR flash on platforms embedding this
-         Cadence IP core.
-
-config TI_QSPI
-       bool "TI QSPI driver"
-       help
-         Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
-         This driver support spi flash single, quad and memory reads.
+         };
 
 config XILINX_SPI
        bool "Xilinx SPI driver"
-       depends on DM_SPI
        help
          Enable the Xilinx SPI driver from the Xilinx EDK. This SPI
          controller support 8 bit SPI transfers only, with or w/o FIFO.
@@ -74,10 +67,18 @@ config XILINX_SPI
 
 config ZYNQ_SPI
        bool "Zynq SPI driver"
-       depends on DM_SPI && (ARCH_ZYNQ || TARGET_XILINX_ZYNQMP)
+       depends on ARCH_ZYNQ || TARGET_XILINX_ZYNQMP
        help
          Enable the Zynq SPI driver. This driver can be used to
          access the SPI NOR flash on platforms embedding this Zynq
          SPI IP core.
 
+endif # if DM_SPI
+
+config TI_QSPI
+       bool "TI QSPI driver"
+       help
+         Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
+         This driver support spi flash single, quad and memory reads.
+
 endmenu # menu "SPI Support"