From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756931AbcBRRk2 (ORCPT ); Thu, 18 Feb 2016 12:40:28 -0500 Received: from down.free-electrons.com ([37.187.137.238]:60214 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756395AbcBRRkX convert rfc822-to-8bit (ORCPT ); Thu, 18 Feb 2016 12:40:23 -0500 From: Gregory CLEMENT To: Tejun Heo , Hans de Goede Cc: Andrew Lunn , Sebastian Hesselbarth , arm@kernel.org, Catalin Marinas , Will Deacon , Jonathan Corbet , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, Jason Cooper , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Rutland , devicetree@vger.kernel.org, Thomas Petazzoni , linux-arm-kernel@lists.infradead.org, Lior Amsalem , Nadav Haklai , Omri Itach Subject: Re: [PATCH v4 04/12] ata: ahci_mvebu: add support for Armada 3700 variant References: <1455646502-23834-1-git-send-email-gregory.clement@free-electrons.com> <1455646502-23834-5-git-send-email-gregory.clement@free-electrons.com> Date: Thu, 18 Feb 2016 18:39:26 +0100 In-Reply-To: <1455646502-23834-5-git-send-email-gregory.clement@free-electrons.com> (Gregory CLEMENT's message of "Tue, 16 Feb 2016 19:14:54 +0100") Message-ID: <87y4ahq5o1.fsf@free-electrons.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Tejun and Hans, On mar., févr. 16 2016, Gregory CLEMENT wrote: > From: Lior Amsalem > > 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 > Reviewed-by: Nadav Haklai > Tested-by: Nadav Haklai > Signed-off-by: Gregory CLEMENT 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 > --- > 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