[PATCH v4 04/12] ata: ahci_mvebu: add support for Armada 3700 variant
From: Gregory CLEMENT <hidden>
Date: 2016-02-18 17:40:28
Also in:
linux-devicetree, linux-ide, linux-serial, lkml
Possibly related (same subject, not in this thread)
- 2016-02-18 · Re: [PATCH v4 04/12] ata: ahci_mvebu: add support for Armada 3700 variant · Tejun Heo <tj@kernel.org>
- 2016-02-16 · [PATCH v4 04/12] ata: ahci_mvebu: add support for Armada 3700 variant · Gregory CLEMENT <hidden>
Hi Tejun and Hans, On mar., f?vr. 16 2016, Gregory CLEMENT [off-list ref] wrote:
From: Lior Amsalem <redacted> The main difference in the new Armada 3700 is that no address decoding needs to take place in the driver probe. [gregory.clement at free-electrons.com: reformulate the commit log] Signed-off-by: Lior Amsalem <redacted> Reviewed-by: Nadav Haklai <redacted> Tested-by: Nadav Haklai <redacted> Signed-off-by: Gregory CLEMENT <redacted>
I took care of the arm related part of the series, but I will let you apply this patch in the sata subsystem once you have reviewed it. But if for any reason you preferred that I took it through mvebu just tell me. Thanks, Gregory
quoted hunk
--- 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, &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);-- 2.5.0
-- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com