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

Pull libata updates from Tejun Heo:
 "Nothing too interesting - another ahci platform driver variant,
  additional controller support, minor fixes and cleanups"

* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: Add Device ID for HighPoint RocketRaid 642L
  ata: ep93xx: use dmaengine_prep_slave_sg api instead of internal callback
  ahci: add PCI ID for Marvell 88SE91A0 SATA Controller
  sata_fsl: remove check for CONFIG_MPC8315_DS
  ahci: add support for Hisilicon sata
  libahci_platform: add host_flags parameter in ahci_platform_init_host()
  ata: ahci: append new hflag AHCI_HFLAG_NO_FBS
  ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers
  ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces
  Documentation: dt-bindings: reformat and order list of ahci-platform compatibles
  libata-sff: remove dead code
  ata: SATL compliance for Inquiry Product Revision
  pata_octeon_cf: use devm_kzalloc() to allocate cf_port

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/ata/ahci.h
index af63c75,60db49b..05882e4
--- 1/drivers/ata/ahci.h
--- 2/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@@ -236,7 -235,7 +236,8 @@@ enum 
                                                        port start (wait until
                                                        error-handling stage) */
        AHCI_HFLAG_MULTI_MSI            = (1 << 16), /* multiple PCI MSIs */
 -      AHCI_HFLAG_NO_FBS               = (1 << 17), /* no FBS */
 +      AHCI_HFLAG_NO_DEVSLP            = (1 << 17), /* no device sleep */
++      AHCI_HFLAG_NO_FBS               = (1 << 18), /* no FBS */
  
        /* ap->flags bits */
  

diff --cc drivers/ata/ahci_imx.c
index 8befeb6,e7e44a7..3a90152
--- 1/drivers/ata/ahci_imx.c
--- 2/drivers/ata/ahci_imx.c
+++ b/drivers/ata/ahci_imx.c
@@@ -430,9 -265,10 +430,10 @@@ static int imx_ahci_probe(struct platfo
        }
  
        reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000;
 -      writel(reg_val, hpriv->mmio + HOST_TIMER1MS);
 +      writel(reg_val, hpriv->mmio + IMX_TIMER1MS);
  
-       ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info, 0, 0);
+       ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info,
+                                     0, 0, 0);
        if (ret)
                imx_sata_disable(hpriv);
  

diff --cc drivers/ata/libahci.c
Simple merge

diff --cc drivers/ata/pata_samsung_cf.c
Simple merge