All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
To: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
	Gregory CLEMENT <gregory.clement@free-electrons.com>,
	arm@kernel.org, Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Jonathan Corbet <corbet@lwn.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jiri Slaby <jslaby@suse.com>,
	linux-serial@vger.kernel.org, Tejun Heo <tj@kernel.org>,
	Hans de Goede <hdegoede@redhat.com>,
	linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
	Mark Rutland <mark.rutland@arm.com>,
	devicetree@vger.kernel.org,
	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
	linux-arm-kernel@lists.infradead.org,
	Lior Amsalem <alior@marvell.com>,
	Nadav Haklai <nadavh@marvell.com>, Omri Itach <omrii@marvell.com>
Subject: [PATCH v3 04/12] ata: ahci_mvebu: add support for Armada 3700 variant
Date: Mon,  8 Feb 2016 18:14:12 +0100	[thread overview]
Message-ID: <1454951660-13289-5-git-send-email-gregory.clement@free-electrons.com> (raw)
In-Reply-To: <1454951660-13289-1-git-send-email-gregory.clement@free-electrons.com>

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

WARNING: multiple messages have this Message-ID (diff)
From: gregory.clement@free-electrons.com (Gregory CLEMENT)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 04/12] ata: ahci_mvebu: add support for Armada 3700 variant
Date: Mon,  8 Feb 2016 18:14:12 +0100	[thread overview]
Message-ID: <1454951660-13289-5-git-send-email-gregory.clement@free-electrons.com> (raw)
In-Reply-To: <1454951660-13289-1-git-send-email-gregory.clement@free-electrons.com>

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

  parent reply	other threads:[~2016-02-08 17:14 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-08 17:14 [PATCH v3 00/12] Add support for the Armada 3700 SoC an mvebu ARM64 based Gregory CLEMENT
2016-02-08 17:14 ` Gregory CLEMENT
2016-02-08 17:14 ` [PATCH v3 01/12] irqchip: armada-370-xp: add Kconfig option for the driver Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-09 15:14   ` Arnd Bergmann
2016-02-09 15:14     ` Arnd Bergmann
2016-02-08 17:14 ` [PATCH v3 02/12] irqchip: armada-370-xp: do not enable it by default when ARCH_MVEBU is selected Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-16 18:16   ` Jason Cooper
2016-02-16 18:16     ` Jason Cooper
2016-02-08 17:14 ` [PATCH v3 03/12] serial: mvebu-uart: initial support for Armada-3700 serial port Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-08 17:14 ` Gregory CLEMENT [this message]
2016-02-08 17:14   ` [PATCH v3 04/12] ata: ahci_mvebu: add support for Armada 3700 variant Gregory CLEMENT
2016-02-08 17:14 ` [PATCH v3 05/12] arm64: add mvebu architecture entry Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-16  6:12   ` Jisheng Zhang
2016-02-16  6:12     ` Jisheng Zhang
2016-02-16  6:12     ` Jisheng Zhang
2016-02-16 17:03     ` Gregory CLEMENT
2016-02-16 17:03       ` Gregory CLEMENT
2016-02-16 17:03       ` Gregory CLEMENT
2016-02-08 17:14 ` [PATCH v3 06/12] Documentation: dt-bindings: Add a new compatible for the Armada 3700 Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-08 17:14 ` [PATCH v3 07/12] Documentation: dt: Tidy up the Marvell related files Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
     [not found] ` <1454951660-13289-1-git-send-email-gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2016-02-08 17:14   ` [PATCH v3 08/12] devicetree: bindings: add DT binding for the Marvell Armada 3700 SoC family Gregory CLEMENT
2016-02-08 17:14     ` Gregory CLEMENT
2016-02-08 17:14     ` Gregory CLEMENT
2016-02-12 14:49     ` Rob Herring
2016-02-12 14:49       ` Rob Herring
2016-02-09 15:23   ` [PATCH v3 00/12] Add support for the Armada 3700 SoC an mvebu ARM64 based Arnd Bergmann
2016-02-09 15:23     ` Arnd Bergmann
2016-02-09 15:23     ` Arnd Bergmann
2016-02-08 17:14 ` [PATCH v3 09/12] arm64: dts: add the Marvell Armada 3700 family and a development board Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-16  6:16   ` Jisheng Zhang
2016-02-16  6:16     ` Jisheng Zhang
2016-02-16  6:16     ` Jisheng Zhang
2016-02-16 17:02     ` Gregory CLEMENT
2016-02-16 17:02       ` Gregory CLEMENT
2016-02-16 17:02       ` Gregory CLEMENT
2016-02-08 17:14 ` [PATCH v3 10/12] MAINTAINERS: Extend dts entry for ARM64 mvebu files Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-08 17:14 ` [PATCH v3 11/12] Documentation: arm: update supported Marvell EBU processors Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT
2016-02-08 17:14 ` [PATCH v3 12/12] arm64: defconfig: enable Armada 3700 related config Gregory CLEMENT
2016-02-08 17:14   ` Gregory CLEMENT

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1454951660-13289-5-git-send-email-gregory.clement@free-electrons.com \
    --to=gregory.clement@free-electrons.com \
    --cc=alior@marvell.com \
    --cc=andrew@lunn.ch \
    --cc=arm@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=corbet@lwn.net \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=jason@lakedaemon.net \
    --cc=jslaby@suse.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=nadavh@marvell.com \
    --cc=omrii@marvell.com \
    --cc=sebastian.hesselbarth@gmail.com \
    --cc=thomas.petazzoni@free-electrons.com \
    --cc=tj@kernel.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.