Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[karo-tx-linux.git] / drivers / ata / ahci_mvebu.c

diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index f7a7fa81740e8f7e7f1daa0c6d6e48d344496ceb..de7128d81e9ccbc168627a02bb2a39d3e4f11c5c 100644 (file)
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -112,12 +112,15 @@ static int ahci_mvebu_probe(struct platform_device *pdev)
        if (rc)
                return rc;
 
-       dram = mv_mbus_dram_info();
-       if (!dram)
-               return -ENODEV;
+       if (of_device_is_compatible(pdev->dev.of_node,
+                                   "marvell,armada-380-ahci")) {
+               dram = mv_mbus_dram_info();
+               if (!dram)
+                       return -ENODEV;
 
-       ahci_mvebu_mbus_config(hpriv, dram);
-       ahci_mvebu_regret_option(hpriv);
+               ahci_mvebu_mbus_config(hpriv, dram);
+               ahci_mvebu_regret_option(hpriv);
+       }
 
        rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info,
                                     &ahci_platform_sht);
@@ -133,6 +136,7 @@ disable_resources:
 
 static const struct of_device_id ahci_mvebu_of_match[] = {
        { .compatible = "marvell,armada-380-ahci", },
+       { .compatible = "marvell,armada-3700-ahci", },
        { },
 };
 MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match);