ahci: add support for Hisilicon sata

The hip04 SoC of hisilicon has an AHCI compliant SATA controller,
and it is compliant with the ahci 1.3 and sata 3.0 specification.

There is a wrong bit in HOST_CAP of hip04 sata controller, which
enable unsupported feature of FBS, use AHCI_HFLAG_NO_FBS hflag to
disable it.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
index d6b07e87aa936e5f7a974c28bcf911e645c81f88..c96d8dcf98fd74a9ba6a8268b0869d042fa91e08 100644 (file)
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@ -8,6 +8,7 @@ Required properties:
   - "allwinner,sun4i-a10-ahci"
   - "fsl,imx53-ahci"
   - "fsl,imx6q-ahci"
+  - "hisilicon,hisi-ahci"
   - "ibm,476gtr-ahci"
   - "marvell,armada-380-ahci"
   - "snps,dwc-ahci"

diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index a476a1fd3f8fa7ae80b17e15a0b2d3f53a8c511b..ebe505c1776398dca27141638c732a6e802e7987 100644 (file)
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/device.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/libata.h>
 #include <linux/ahci_platform.h>
@@ -33,6 +34,7 @@ static int ahci_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct ahci_platform_data *pdata = dev_get_platdata(dev);
        struct ahci_host_priv *hpriv;
+       unsigned long hflags = 0;
        int rc;
 
        hpriv = ahci_platform_get_resources(pdev);
@@ -55,7 +57,11 @@ static int ahci_probe(struct platform_device *pdev)
                        goto disable_resources;
        }
 
-       rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0, 0);
+       if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
+               hflags |= AHCI_HFLAG_NO_FBS;
+
+       rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info,
+                                    hflags, 0, 0);
        if (rc)
                goto pdata_exit;
 
@@ -76,6 +82,7 @@ static const struct of_device_id ahci_of_match[] = {
        { .compatible = "snps,exynos5440-ahci", },
        { .compatible = "ibm,476gtr-ahci", },
        { .compatible = "snps,dwc-ahci", },
+       { .compatible = "hisilicon,hisi-ahci", },
        {},
 };
 MODULE_DEVICE_TABLE(of, ahci_of_match);