Skip to content

Commit

Permalink
ata: ahci_mvebu: add support for Armada 3700 variant
Browse files Browse the repository at this point in the history
The main difference in the new Armada 3700 is that no address
decoding needs to take place in the driver probe.

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

Signed-off-by: Lior Amsalem <alior@marvell.com>
Reviewed-by: Nadav Haklai <nadavh@marvell.com>
Tested-by: Nadav Haklai <nadavh@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Lior Amsalem authored and Tejun Heo committed Feb 18, 2016
1 parent 3948b6f commit 15d3ce7
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/ata/ahci_mvebu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -133,6 +136,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev)

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);
Expand Down

0 comments on commit 15d3ce7

Please sign in to comment.