lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 135/233] ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
    Date
    3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Simon Guinot <simon.guinot@sequanux.org>

    commit b1f5c73bd5a4752efb7d7af019034044b08aafe9 upstream.

    The sata_mv driver supports the SATA IP found in several Marvell SoCs.
    As some new SATA registers have been introduced with the Armada 370/XP
    SoCs, a way to identify them is needed.

    This patch introduces a new compatible string for the SATA IP found in
    Armada 370/XP SoCs.

    Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
    Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Cc: Jason Cooper <jason@lakedaemon.net>
    Cc: Andrew Lunn <andrew@lunn.ch>
    Cc: Gregory Clement <gregory.clement@free-electrons.com>
    Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
    Cc: Lior Amsalem <alior@marvell.com>
    Acked-by: Jason Cooper <jason@lakedaemon.net>
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    Documentation/devicetree/bindings/ata/marvell.txt | 2 +-
    drivers/ata/sata_mv.c | 1 +
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/Documentation/devicetree/bindings/ata/marvell.txt b/Documentation/devicetree/bindings/ata/marvell.txt
    index b5cdd20..1c83516 100644
    --- a/Documentation/devicetree/bindings/ata/marvell.txt
    +++ b/Documentation/devicetree/bindings/ata/marvell.txt
    @@ -1,7 +1,7 @@
    * Marvell Orion SATA

    Required Properties:
    -- compatibility : "marvell,orion-sata"
    +- compatibility : "marvell,orion-sata" or "marvell,armada-370-sata"
    - reg : Address range of controller
    - interrupts : Interrupt controller is using
    - nr-ports : Number of SATA ports in use.
    diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
    index 35c6b6d..9258775 100644
    --- a/drivers/ata/sata_mv.c
    +++ b/drivers/ata/sata_mv.c
    @@ -4216,6 +4216,7 @@ static int mv_platform_resume(struct platform_device *pdev)

    #ifdef CONFIG_OF
    static struct of_device_id mv_sata_dt_ids[] = {
    + { .compatible = "marvell,armada-370-sata", },
    { .compatible = "marvell,orion-sata", },
    {},
    };
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-02-07 14:41    [W:2.467 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site