[PATCH v2 04/12] ata: ahci_mvebu: add support for Armada 3700 variant

[Gregory CLEMENT]

From: Lior Amsalem 

The main difference in the new Armada 3700 is that no address
decoding needs to take place in the driver probe.

[gregory.clem...@free-electrons.com: reformulate the commit log]

Signed-off-by: Lior Amsalem 
Reviewed-by: Nadav Haklai 
Tested-by: Nadav Haklai 
Signed-off-by: Gregory CLEMENT 
---
 drivers/ata/ahci_mvebu.c | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index f7a7fa81740e..de7128d81e9c 100644
--- 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, _mvebu_port_info,
 _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);
-- 
2.5.0

[PATCH v2 04/12] ata: ahci_mvebu: add support for Armada 3700 variant

[Gregory CLEMENT]

From: Lior Amsalem 

The main difference in the new Armada 3700 is that no address
decoding needs to take place in the driver probe.

[gregory.clem...@free-electrons.com: reformulate the commit log]

Signed-off-by: Lior Amsalem 
Reviewed-by: Nadav Haklai 
Tested-by: Nadav Haklai 
Signed-off-by: Gregory CLEMENT 
---
 drivers/ata/ahci_mvebu.c | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index f7a7fa81740e..de7128d81e9c 100644
--- 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, _mvebu_port_info,
 _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);
-- 
2.5.0