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

Pull libata fixes from Tejun Heo:
 "Mostly device-specific fixes.  The only thing which isn't is the fix
  for zpodd oops-on-detach bug"

* 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: imx: PLL clock needs 100us to settle down
  ata: pata_at91 only works on sam9
  libata: clean up ZPODD when a port is detached
  ahci: imx: software workaround for phy reset issue in resume
  ahci: imx: add namespace for register enums
  ahci: disable DEVSLP for Intel Valleyview

diff --combined drivers/ata/libata-core.c
index 943cc8b83e59bb7f1b293abce887be717047ffff,886d4d3d63a3e72bbdb83e83ad9e042a73005018..ea83828bfea94b41eae6947cfbbbaa8dfbc15b5a
--- 1/drivers/ata/libata-core.c
--- 2/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@@ -1524,7 -1524,7 +1524,7 @@@ static void ata_qc_complete_internal(st
   *    @dev: Device to which the command is sent
   *    @tf: Taskfile registers for the command and the result
   *    @cdb: CDB for packet command
 - *    @dma_dir: Data tranfer direction of the command
 + *    @dma_dir: Data transfer direction of the command
   *    @sgl: sg list for the data buffer of the command
   *    @n_elem: Number of sg entries
   *    @timeout: Timeout in msecs (0 for default)
@@@ -1712,7 -1712,7 +1712,7 @@@ unsigned ata_exec_internal_sg(struct at
   *    @dev: Device to which the command is sent
   *    @tf: Taskfile registers for the command and the result
   *    @cdb: CDB for packet command
 - *    @dma_dir: Data tranfer direction of the command
 + *    @dma_dir: Data transfer direction of the command
   *    @buf: Data buffer of the command
   *    @buflen: Length of data buffer
   *    @timeout: Timeout in msecs (0 for default)
@@@ -6314,6 -6314,8 +6314,8 @@@ int ata_host_activate(struct ata_host *
  static void ata_port_detach(struct ata_port *ap)
  {
        unsigned long flags;
+       struct ata_link *link;
+       struct ata_device *dev;
  
        if (!ap->ops->error_handler)
                goto skip_eh;
@@@ -6333,6 -6335,13 +6335,13 @@@
        cancel_delayed_work_sync(&ap->hotplug_task);
  
   skip_eh:
+       /* clean up zpodd on port removal */
+       ata_for_each_link(link, ap, HOST_FIRST) {
+               ata_for_each_dev(dev, link, ALL) {
+                       if (zpodd_dev_enabled(dev))
+                               zpodd_exit(dev);
+               }
+       }
        if (ap->pmp_link) {
                int i;
                for (i = 0; i < SATA_PMP_MAX_PORTS; i++)