ahci: Make ahci drivers depend on AHCI

At present all ahci drivers depend on AHCI except for DWC_AHCI. But no
boards enable that without also enabling AHCI:

   /tools/moveconfig.py -f ~AHCI DWC_AHCI
   0 matches

Group them together and sort them in order by Kconfig name (except for
AHCI_MVEBU which uses a different naming convention).

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 6e8363c04d99f6f804495625f77142181a1b18c2..1adf4dc8e2d8ed0389952c31426f2c115e491ed9 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -42,6 +42,8 @@ config AHCI_PCI
        help
          Enables support for the PCI-based AHCI controller.
 
+if AHCI
+
 config SPL_AHCI_PCI
        bool "Support for PCI-based AHCI controller for SPL"
        depends on SPL
@@ -68,23 +70,19 @@ config DWC_AHSATA
 config DWC_AHSATA_AHCI
        bool "Enable DWC AHSATA AHCI driver support"
        depends on DWC_AHSATA
-       depends on AHCI
        default y
        help
          Enable this option unless you need your private ahci implementation
 
-config SUNXI_AHCI
-       bool "Enable Allwinner SATA driver support"
-       depends on AHCI
-       default y if ARCH_SUNXI
+config MTK_AHCI
+       bool "Enable Mediatek AHCI driver support"
        help
-         Enable this driver to support the SATA controllers found in the
-         Allwinner A10, A20 and R40 SoCs.
+         Enable this driver to support Sata devices through
+         Mediatek AHCI controller (e.g. MT7622).
 
 config AHCI_MVEBU
        bool "Marvell EBU AHCI SATA support"
        depends on ARCH_MVEBU || ARCH_OCTEON
-       depends on AHCI
        select SCSI_AHCI
        select DM_SCSI
        help
@@ -93,12 +91,14 @@ config AHCI_MVEBU
 
          If unsure, say N.
 
-config MTK_AHCI
-       bool "Enable Mediatek AHCI driver support"
-       depends on AHCI
+config SUNXI_AHCI
+       bool "Enable Allwinner SATA driver support"
+       default y if ARCH_SUNXI
        help
-         Enable this driver to support Sata devices through
-         Mediatek AHCI controller (e.g. MT7622).
+         Enable this driver to support the SATA controllers found in the
+         Allwinner A10, A20 and R40 SoCs.
+
+endif # AHCI
 
 if SATA