lkml.org 
[lkml]   [2015]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 123/185] net: mvneta: introduce compatible string "marvell, armada-xp-neta"
    Date
    3.16.7-ckt15 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit f522a975a8101895a85354b9c143f41b8248e71a upstream.

    The mvneta driver supports the Ethernet IP found in the Armada 370, XP,
    380 and 385 SoCs. Since at least one more hardware feature is available
    for the Armada XP SoCs then a way to identify them is needed.

    This patch introduces a new compatible string "marvell,armada-xp-neta".

    Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
    Fixes: c5aff18204da ("net: mvneta: driver for Marvell Armada 370/XP network unit")
    Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
    Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | 2 +-
    drivers/net/ethernet/marvell/mvneta.c | 1 +
    2 files changed, 2 insertions(+), 1 deletion(-)

    diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
    index 750d577e8083..f5a8ca29aff0 100644
    --- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
    +++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
    @@ -1,7 +1,7 @@
    * Marvell Armada 370 / Armada XP Ethernet Controller (NETA)

    Required properties:
    -- compatible: should be "marvell,armada-370-neta".
    +- compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta".
    - reg: address and length of the register set for the device.
    - interrupts: interrupt for the device
    - phy: See ethernet.txt file in the same directory.
    diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
    index 393d49202f23..4456171c885d 100644
    --- a/drivers/net/ethernet/marvell/mvneta.c
    +++ b/drivers/net/ethernet/marvell/mvneta.c
    @@ -3096,6 +3096,7 @@ static int mvneta_remove(struct platform_device *pdev)

    static const struct of_device_id mvneta_match[] = {
    { .compatible = "marvell,armada-370-neta" },
    + { .compatible = "marvell,armada-xp-neta" },
    { }
    };
    MODULE_DEVICE_TABLE(of, mvneta_match);

    \
     
     \ /
      Last update: 2015-07-15 12:01    [W:4.625 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site