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

Pull libata sata_dwc_460ex updates from Tejun Heo:
 "Patches to bring sata_dwc_460ex up to snuff.

  It was a separate pull request because it depends on dmaengine dw
  platform changes which are now in mainline"

* 'for-4.7-dw' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (24 commits)
  ata: dwc: add DMADEVICES dependency
  powerpc/4xx: Device tree update for the 460ex DWC SATA
  ata: sata_dwc_460ex: make debug messages neat
  ata: sata_dwc_460ex: supply physical address of FIFO to DMA
  ata: sata_dwc_460ex: use devm_ioremap
  ata: sata_dwc_460ex: tidy up sata_dwc_clear_dmacr()
  ata: sata_dwc_460ex: use readl/writel_relaxed()
  ata: sata_dwc_460ex: switch to new dmaengine_terminate_* API
  ata: sata_dwc_460ex: add __iomem to register base pointer
  ata: sata_dwc_460ex: get rid of incorrect cast
  ata: sata_dwc_460ex: get rid of some pointless casts
  ata: sata_dwc_460ex: remove empty libata callback
  ata: sata_dwc_460ex: correct HOSTDEV{P}_FROM_*() macros
  ata: sata_dwc_460ex: get rid of global data
  ata: sata_dwc_460ex: add phy support
  ata: sata_dwc_460ex: use "dmas" DT property to find dma channel
  ata: sata_dwc_460ex: don't call ata_sff_qc_issue() on DMA commands
  ata: sata_dwc_460ex: skip dma setup for non-dma commands
  ata: sata_dwc_460ex: select only core part of DMA driver
  ata: sata_dwc_460ex: DMA is always a flow controller
  ...

diff --combined drivers/ata/Kconfig
index cfa936a32513b1d70d74834fa743b6f612665dc1,2fbf355d9142d75addc576dcca1111564b6f4ed9..e2dc4c0451466642d3c30853dda96d4de58807f2
--- 1/drivers/ata/Kconfig
--- 2/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@@ -202,14 -202,6 +202,14 @@@ config SATA_FS
  
          If unsure, say N.
  
 +config SATA_AHCI_SEATTLE
 +      tristate "AMD Seattle 6.0Gbps AHCI SATA host controller support"
 +      depends on ARCH_SEATTLE
 +      help
 +       This option enables support for AMD Seattle SATA host controller.
 +
 +       If unsure, say N
 +
  config SATA_INIC162X
        tristate "Initio 162x SATA support (Very Experimental)"
        depends on PCI
@@@ -313,14 -305,23 +313,23 @@@ config ATA_PII
  
  config SATA_DWC
        tristate "DesignWare Cores SATA support"
-       depends on 460EX
-       select DW_DMAC
+       depends on DMADEVICES
+       select GENERIC_PHY
        help
          This option enables support for the on-chip SATA controller of the
          AppliedMicro processor 460EX.
  
          If unsure, say N.
  
+ config SATA_DWC_OLD_DMA
+       bool "Support old device trees"
+       depends on SATA_DWC
+       select DW_DMAC_CORE
+       default y if 460EX
+       help
+         This option enables support for old device trees without the
+         "dmas" property.
+ 
  config SATA_DWC_DEBUG
        bool "Debugging driver version"
        depends on SATA_DWC