diff options
author | Lior Amsalem <alior@marvell.com> | 2016-02-16 13:14:54 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-02-18 12:41:17 -0500 |
commit | 15d3ce7b63bd7c0b8706d7360aa862d7b027bf8c (patch) | |
tree | 2bb32ec15115177cdbff59f00bb43b8a113096fd /drivers/ata/ahci_mvebu.c | |
parent | 3948b6f2b7677165324afe52c3bd0088ca7c776c (diff) |
ata: ahci_mvebu: add support for Armada 3700 variant
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>
Diffstat (limited to 'drivers/ata/ahci_mvebu.c')
-rw-r--r-- | drivers/ata/ahci_mvebu.c | 14 |
1 files 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) | |||
112 | if (rc) | 112 | if (rc) |
113 | return rc; | 113 | return rc; |
114 | 114 | ||
115 | dram = mv_mbus_dram_info(); | 115 | if (of_device_is_compatible(pdev->dev.of_node, |
116 | if (!dram) | 116 | "marvell,armada-380-ahci")) { |
117 | return -ENODEV; | 117 | dram = mv_mbus_dram_info(); |
118 | if (!dram) | ||
119 | return -ENODEV; | ||
118 | 120 | ||
119 | ahci_mvebu_mbus_config(hpriv, dram); | 121 | ahci_mvebu_mbus_config(hpriv, dram); |
120 | ahci_mvebu_regret_option(hpriv); | 122 | ahci_mvebu_regret_option(hpriv); |
123 | } | ||
121 | 124 | ||
122 | rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, | 125 | rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, |
123 | &ahci_platform_sht); | 126 | &ahci_platform_sht); |
@@ -133,6 +136,7 @@ disable_resources: | |||
133 | 136 | ||
134 | static const struct of_device_id ahci_mvebu_of_match[] = { | 137 | static const struct of_device_id ahci_mvebu_of_match[] = { |
135 | { .compatible = "marvell,armada-380-ahci", }, | 138 | { .compatible = "marvell,armada-380-ahci", }, |
139 | { .compatible = "marvell,armada-3700-ahci", }, | ||
136 | { }, | 140 | { }, |
137 | }; | 141 | }; |
138 | MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match); | 142 | MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match); |