Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Pull libata updates from Tejun Heo:
 "A lot of activities on libata side this time.

   - A lot of changes around ahci.  Various embedded platforms are
     implementing ahci controllers.  Some were built atop ahci_platform,
     others were doing their own things.  Hans made some structural
     changes to libahci and librarized ahci_platform so that ahci
     platform drivers can share more common code.  A couple platform
     drivers are added on top of that and several are added to replace
     older drivers which were doing their own things (older ones are
     scheduled to be removed).

   - Dan finishes the patchset to make libata PM operations
     asynchronous.  Combined with one patch being routed through scsi,
     this should speed resume measurably.

   - Various fixes and cleanups from Bartlomiej and others"

* 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (61 commits)
  ata: fix Marvell SATA driver dependencies
  ata: fix ARASAN CompactFlash PATA driver dependencies
  ata: remove superfluous casts
  ata: sata_highbank: remove superfluous cast
  ata: fix Calxeda Highbank SATA driver dependencies
  ata: fix R-Car SATA driver dependencies
  ARM: davinci: da850: update SATA AHCI support
  ata: add new-style AHCI platform driver for DaVinci DA850 AHCI controller
  ata: move library code from ahci_platform.c to libahci_platform.c
  ata: ahci_platform: fix ahci_platform_data->suspend method handling
  libata: remove unused ata_sas_port_async_resume() stub
  libata.h: add stub for ata_sas_port_resume
  libata: async resume
  libata, libsas: kill pm_result and related cleanup
  ata: Fix compiler warning with APM X-Gene host controller driver
  arm64: Add APM X-Gene SoC AHCI SATA host controller DTS entries
  ata: Add APM X-Gene SoC AHCI SATA host controller driver
  Documentation: Add documentation for the APM X-Gene SoC SATA host controller DTS binding
  arm64: Add APM X-Gene SoC 15Gbps Multi-purpose PHY DTS entries
  ata: ahci_sunxi: fix code formatting
  ...

1 files changed, 47 insertions, 9 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 868429a47be4..20e03a7eb8b4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -11,13 +11,13 @@ config HAVE_PATA_PLATFORM
           to update the PATA_PLATFORM entry.
 
 menuconfig ATA
-        tristate "Serial ATA and Parallel ATA drivers"
+        tristate "Serial ATA and Parallel ATA drivers (libata)"
         depends on HAS_IOMEM
         depends on BLOCK
         depends on !(M32R || M68K || S390) || BROKEN
         select SCSI
         ---help---
-          If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
+          If you want to use an ATA hard disk, ATA tape drive, ATA CD-ROM or
           any other ATA device under Linux, say Y and make sure that you know
           the name of your ATA host adapter (the card inside your computer
           that "speaks" the ATA protocol, also called ATA controller),
@@ -60,7 +60,7 @@ config ATA_ACPI
 
 config SATA_ZPODD
         bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
-        depends on ATA_ACPI
+        depends on ATA_ACPI && PM_RUNTIME
         default n
         help
           This option adds support for SATA Zero Power Optical Disc
@@ -97,15 +97,48 @@ config SATA_AHCI_PLATFORM
 
           If unsure, say N.
 
+config AHCI_DA850
+        tristate "DaVinci DA850 AHCI SATA support"
+        depends on ARCH_DAVINCI_DA850
+        help
+          This option enables support for the DaVinci DA850 SoC's
+          onboard AHCI SATA.
+
+          If unsure, say N.
+
+config AHCI_ST
+        tristate "ST AHCI SATA support"
+        depends on ARCH_STI
+        help
+          This option enables support for ST AHCI SATA controller.
+
+          If unsure, say N.
+
 config AHCI_IMX
         tristate "Freescale i.MX AHCI SATA support"
-        depends on SATA_AHCI_PLATFORM && MFD_SYSCON
+        depends on MFD_SYSCON
         help
           This option enables support for the Freescale i.MX SoC's
           onboard AHCI SATA.
 
           If unsure, say N.
 
+config AHCI_SUNXI
+        tristate "Allwinner sunxi AHCI SATA support"
+        depends on ARCH_SUNXI
+        help
+          This option enables support for the Allwinner sunxi SoC's
+          onboard AHCI SATA.
+
+          If unsure, say N.
+
+config AHCI_XGENE
+        tristate "APM X-Gene 6.0Gbps AHCI SATA host controller support"
+        depends on ARM64 || COMPILE_TEST
+        select PHY_XGENE
+        help
+         This option enables support for APM X-Gene SoC SATA host controller.
+
 config SATA_FSL
         tristate "Freescale 3.0Gbps SATA support"
         depends on FSL_SOC
@@ -239,6 +272,7 @@ config SATA_DWC_VDEBUG
 
 config SATA_HIGHBANK
         tristate "Calxeda Highbank SATA support"
+        depends on ARCH_HIGHBANK || COMPILE_TEST
         help
           This option enables support for the Calxeda Highbank SoC's
           onboard SATA.
@@ -247,6 +281,8 @@ config SATA_HIGHBANK
 
 config SATA_MV
         tristate "Marvell SATA support"
+        depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+                   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
         select GENERIC_PHY
         help
           This option enables support for the Marvell Serial ATA family.
@@ -273,6 +309,7 @@ config SATA_PROMISE
 
 config SATA_RCAR
         tristate "Renesas R-Car SATA support"
+        depends on ARCH_SHMOBILE || COMPILE_TEST
         help
           This option enables support for Renesas R-Car Serial ATA.
 
@@ -352,6 +389,7 @@ config PATA_AMD
 
 config PATA_ARASAN_CF
         tristate "ARASAN CompactFlash PATA Controller Support"
+        depends on ARCH_SPEAR13XX || COMPILE_TEST
         depends on DMADEVICES
         select DMA_ENGINE
         help
@@ -403,7 +441,7 @@ config PATA_CMD64X
 
 config PATA_CS5520
         tristate "CS5510/5520 PATA support"
-        depends on PCI
+        depends on PCI && (X86_32 || COMPILE_TEST)
         help
           This option enables support for the Cyrix 5510/5520
           companion chip used with the MediaGX/Geode processor family.
@@ -412,7 +450,7 @@ config PATA_CS5520
 
 config PATA_CS5530
         tristate "CS5530 PATA support"
-        depends on PCI
+        depends on PCI && (X86_32 || COMPILE_TEST)
         help
           This option enables support for the Cyrix/NatSemi/AMD CS5530
           companion chip used with the MediaGX/Geode processor family.
@@ -421,7 +459,7 @@ config PATA_CS5530
 
 config PATA_CS5535
         tristate "CS5535 PATA support (Experimental)"
-        depends on PCI && X86 && !X86_64
+        depends on PCI && X86_32
         help
           This option enables support for the NatSemi/AMD CS5535
           companion chip used with the Geode processor family.
@@ -430,7 +468,7 @@ config PATA_CS5535
 
 config PATA_CS5536
         tristate "CS5536 PATA support"
-        depends on PCI
+        depends on PCI && (X86_32 || MIPS || COMPILE_TEST)
         help
           This option enables support for the AMD CS5536
           companion chip used with the Geode LX processor family.
@@ -666,7 +704,7 @@ config PATA_RDC
 
 config PATA_SC1200
         tristate "SC1200 PATA support"
-        depends on PCI
+        depends on PCI && (X86_32 || COMPILE_TEST)
         help
           This option enables support for the NatSemi/AMD SC1200 SoC
           companion chip used with the Geode processor family.