[PATCH 3/4] arm: mvebu: add Ethernet controllers using mvneta driver for Armada 370/XP

Nobuhiro Iwamatsu iwamatsu at nigauri.org
Tue Oct 30 00:19:15 EDT 2012


On Fri, Oct 26, 2012 at 7:03 PM, Thomas Petazzoni
<thomas.petazzoni at free-electrons.com> wrote:
> The Armada 370 SoC has two network units, while the Armada XP has four
> network units. The first two network units are common to both the
> Armada XP and Armada 370, so they are added to armada-370-xp.dtsi,
> while the other two network units are specific to the Armada XP and
> therefore added to armada-xp.dtsi.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> ---
>  arch/arm/boot/dts/armada-370-xp.dtsi |   14 ++++++++++++++
>  arch/arm/boot/dts/armada-xp.dtsi     |   14 ++++++++++++++
>  2 files changed, 28 insertions(+)
>
> diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
> index 16cc82c..d484492 100644
> --- a/arch/arm/boot/dts/armada-370-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
> @@ -68,6 +68,20 @@
>                         compatible = "marvell,armada-addr-decoding-controller";
>                         reg = <0xd0020000 0x258>;
>                 };
> +
> +                ethernet at d0070000 {
> +                               compatible = "marvell,armada-370-neta";
> +                               reg = <0xd0070000 0x2500>;
> +                               interrupts = <8>;
> +                               status = "disabled";
> +                };
> +
> +                ethernet at d0074000 {
> +                               compatible = "marvell,armada-370-neta";
> +                               reg = <0xd0074000 0x2500>;
> +                               interrupts = <10>;
> +                               status = "disabled";
> +                };

Could you fit an indent?

>         };
>  };
>
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index 71d6b5d..c77a43e 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -51,5 +51,19 @@
>                                 compatible = "marvell,armada-370-xp-system-controller";
>                                 reg = <0xd0018200 0x500>;
>                 };
> +
> +                ethernet at d0030000 {
> +                               compatible = "marvell,armada-370-neta";
> +                               reg = <0xd0030000 0x2500>;
> +                               interrupts = <12>;
> +                               status = "disabled";
> +                };
> +
> +                ethernet at d0034000 {
> +                               compatible = "marvell,armada-370-neta";
> +                               reg = <0xd0034000 0x2500>;
> +                               interrupts = <14>;
> +                               status = "disabled";
> +                };

likewise.

-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6



More information about the linux-arm-kernel mailing list