diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-15 02:06:19 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-15 02:06:19 +0400 |
| commit | 9214cbe50fe74542f803dcc8d81f5e99c72918bf (patch) | |
| tree | 8d25ccc14e81ac0fa621108c9ab913a524658c3a /arch/arm/boot/dts/armada-xp.dtsi | |
| parent | 1e76c7cb3c1d281be2e452e780e53859abc7c145 (diff) | |
| parent | 918f8f309643978b9e761f39af8962a7388d332d (diff) | |
| download | linux-9214cbe50fe74542f803dcc8d81f5e99c72918bf.tar.xz | |
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-xp.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 5b902f9a3af2..e481d54b565c 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi @@ -22,6 +22,10 @@ model = "Marvell Armada XP family SoC"; compatible = "marvell,armadaxp", "marvell,armada-370-xp"; + aliases { + eth2 = ð2; + }; + soc { internal-regs { L2: l2-cache { @@ -86,7 +90,7 @@ reg = <0x18200 0x500>; }; - ethernet@30000 { + eth2: ethernet@30000 { compatible = "marvell,armada-370-neta"; reg = <0x30000 0x2500>; interrupts = <12>; |