lkml.org 
[lkml]   [2016]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH v4 04/12] ata: ahci_mvebu: add support for Armada 3700 variant
    Date
    Hi Tejun and Hans,

    On mar., févr. 16 2016, Gregory CLEMENT <gregory.clement@free-electrons.com> wrote:

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

    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

    \
     
     \ /
      Last update: 2016-02-18 19:21    [W:2.316 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site