Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1325846

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

Show all headers | View raw

From: Lior Amsalem <alior@marvell.com>

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>
---
 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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 00/12] Add support for the Armada 3700 SoC an mvebu ARM64 based Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
  [PATCH v2 10/12] MAINTAINERS: Extend dts entry for ARM64 mvebu files Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
  [PATCH v2 11/12] Documentation: arm: update supported Marvell EBU processors Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
  [PATCH v2 09/12] arm64: dts: add the Marvell Armada 3700 family and a development board Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
  [PATCH v2 06/12] Documentation: dt-bindings: Add a new compatible for the Armada 3700 Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
  [PATCH v2 01/12] irqchip: armada-370-xp: add Kconfig option for the driver Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
  [PATCH v2 04/12] ata: ahci_mvebu: add support for Armada 3700 variant Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
  [PATCH v2 08/12] devicetree: bindings: add DT binding for the Marvell Armada 3700 SoC family Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
    Re: [PATCH v2 08/12] devicetree: bindings: add DT binding for the  Marvell Armada 3700 SoC family Rob Herring <robh@kernel.org> - 2016-02-03 21:30 +0100
    Re: [PATCH v2 08/12] devicetree: bindings: add DT binding for the  Marvell Armada 3700 SoC family Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2016-02-03 21:40 +0100
      Re: [PATCH v2 08/12] devicetree: bindings: add DT binding for the Marvell Armada 3700 SoC family Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-05 17:10 +0100
  [PATCH v2 03/12] serial: mvebu-uart: initial support for Armada-3700 serial port Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-03 19:50 +0100
    Re: [PATCH v2 03/12] serial: mvebu-uart: initial support for  Armada-3700 serial port Marcin Wojtas <mw@semihalf.com> - 2016-02-03 22:50 +0100
      Re: [PATCH v2 03/12] serial: mvebu-uart: initial support for  Armada-3700 serial port Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - 2016-02-03 23:10 +0100
        Re: [PATCH v2 03/12] serial: mvebu-uart: initial support for  Armada-3700 serial port Marcin Wojtas <mw@semihalf.com> - 2016-02-03 23:30 +0100
          RE: [PATCH v2 03/12] serial: mvebu-uart: initial support for  Armada-3700 serial port Ofer Heifetz <oferh@marvell.com> - 2016-02-04 04:30 +0100
    Re: [PATCH v2 03/12] serial: mvebu-uart: initial support for  Armada-3700 serial port Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-07 08:20 +0100
      Re: [PATCH v2 03/12] serial: mvebu-uart: initial support for Armada-3700 serial port Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-02-07 12:20 +0100

csiph-web