diff options
author | Olof Johansson <olof@lixom.net> | 2013-06-15 00:06:19 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-15 00:06:19 +0200 |
commit | 9214cbe50fe74542f803dcc8d81f5e99c72918bf (patch) | |
tree | 8d25ccc14e81ac0fa621108c9ab913a524658c3a /arch/arm/boot/dts/armada-370-xp.dtsi | |
parent | Merge tag 'exynos-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgen... (diff) | |
parent | ARM: Kirkwood: ts219: Enable second PCIe port in DT. (diff) | |
download | linux-9214cbe50fe74542f803dcc8d81f5e99c72918bf.tar.xz linux-9214cbe50fe74542f803dcc8d81f5e99c72918bf.zip |
Merge tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux into next/dt
From Jason Cooper:
mvebu dt changes for v3.11 (round 5)
- mvebu
- set aliases for ethernet interfaces
- PCIe range for armada-xp-db
- rm unused properties on A370
- kirkwood
- assign sheevaplug pinmuxs to correct devices
- enable second PCIe port for ts219
* tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: ts219: Enable second PCIe port in DT.
ARM: mvebu: Remove device tree unused properties on A370
arm: mvebu: armada-xp-db: ensure PCIe range is specified
arm: kirkwood: sheevaplug: move pinmux configs to the right devices
ARM: mvebu: set aliases for ethernet controllers
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-370-xp.dtsi')
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 36feff3a363e..a679b6697a98 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -22,6 +22,11 @@ model = "Marvell Armada 370 and XP SoC"; compatible = "marvell,armada-370-xp"; + aliases { + eth0 = ð0; + eth1 = ð1; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -98,7 +103,7 @@ reg = <0x72004 0x4>; }; - ethernet@70000 { + eth0: ethernet@70000 { compatible = "marvell,armada-370-neta"; reg = <0x70000 0x2500>; interrupts = <8>; @@ -106,7 +111,7 @@ status = "disabled"; }; - ethernet@74000 { + eth1: ethernet@74000 { compatible = "marvell,armada-370-neta"; reg = <0x74000 0x2500>; interrupts = <10>; |