diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
| commit | 05e121af947aa59647762aaf3773b6f53f498f67 (patch) | |
| tree | d9697c5b3d78396ecb98d251a35e856bbf24118c /arch/arm/boot/dts/armada-xp.dtsi | |
| parent | bb4f6ce2f3683e11e79d923eac945e49ddb6df4a (diff) | |
| parent | 9f32cccc67590ccda30529bcbcea5c22d95c00a6 (diff) | |
| download | blackbird-op-linux-05e121af947aa59647762aaf3773b6f53f498f67.tar.gz blackbird-op-linux-05e121af947aa59647762aaf3773b6f53f498f67.zip | |
Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
Marvell boards changes related to Ethernet, for 3.8
Conflicts:
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-xp-db.dts
Diffstat (limited to 'arch/arm/boot/dts/armada-xp.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index f51554e80009..fbe30f5e98a8 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -71,5 +71,19 @@ compatible = "marvell,armada-370-xp-system-controller"; reg = <0xd0018200 0x500>; }; + + ethernet@d0030000 { + compatible = "marvell,armada-370-neta"; + reg = <0xd0030000 0x2500>; + interrupts = <12>; + status = "disabled"; + }; + + ethernet@d0034000 { + compatible = "marvell,armada-370-neta"; + reg = <0xd0034000 0x2500>; + interrupts = <14>; + status = "disabled"; + }; }; }; |
