From: gregory.clement@free-electrons•com (Gregory CLEMENT)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 1/3] net: mvneta: introduce compatible string "marvell, armada-xp-neta"
Date: Mon, 29 Jun 2015 15:03:59 +0200 [thread overview]
Message-ID: <5591423F.8060804@free-electrons.com> (raw)
In-Reply-To: <1434547162-6275-2-git-send-email-simon.guinot@sequanux.org>
Hi Simon,
On 17/06/2015 15:19, Simon Guinot wrote:
> 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>
> Cc: <stable@vger•kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons•com>
Thanks,
Gregory
> ---
> 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 ce5f7f9cff06..aceb977b104d 100644
> --- a/drivers/net/ethernet/marvell/mvneta.c
> +++ b/drivers/net/ethernet/marvell/mvneta.c
> @@ -3179,6 +3179,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);
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2015-06-29 13:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 13:19 [PATCH v2 0/3] Fix Ethernet jumbo frames support for Armada 370 and 38x Simon Guinot
2015-06-17 13:19 ` [PATCH v2 1/3] net: mvneta: introduce compatible string "marvell, armada-xp-neta" Simon Guinot
2015-06-17 15:12 ` Gregory CLEMENT
2015-06-17 15:15 ` Gregory CLEMENT
2015-06-17 17:01 ` Jason Cooper
2015-06-17 20:43 ` Thomas Petazzoni
2015-06-17 21:39 ` Jason Cooper
2015-06-18 7:31 ` Thomas Petazzoni
2015-06-19 12:32 ` Simon Guinot
2015-06-25 9:13 ` Simon Guinot
2015-06-25 13:20 ` Jason Cooper
2015-06-29 13:03 ` Gregory CLEMENT
2015-06-29 13:03 ` Gregory CLEMENT [this message]
2015-06-17 13:19 ` [PATCH v2 2/3] ARM: mvebu: update Ethernet compatible string for Armada XP Simon Guinot
2015-06-29 13:04 ` Gregory CLEMENT
2015-06-17 13:19 ` [PATCH v2 3/3] ARM: mvebu: disable IP checksum with jumbo frames for Armada 370 Simon Guinot
2015-06-17 15:24 ` [PATCH v2 0/3] Fix Ethernet jumbo frames support for Armada 370 and 38x Thomas Petazzoni
2015-06-17 17:22 ` Simon Guinot
2015-06-17 20:43 ` Thomas Petazzoni
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=5591423F.8060804@free-electrons.com \
--to=gregory.clement@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox