summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/armada-370.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-14 15:06:19 -0700
committerOlof Johansson <olof@lixom.net>2013-06-14 15:06:19 -0700
commit9214cbe50fe74542f803dcc8d81f5e99c72918bf (patch)
tree8d25ccc14e81ac0fa621108c9ab913a524658c3a /arch/arm/boot/dts/armada-370.dtsi
parent1e76c7cb3c1d281be2e452e780e53859abc7c145 (diff)
parent918f8f309643978b9e761f39af8962a7388d332d (diff)
downloadblackbird-op-linux-9214cbe50fe74542f803dcc8d81f5e99c72918bf.tar.gz
blackbird-op-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.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-370.dtsi4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index aee2b1866ce2..fa3dfc6b4c6a 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -180,10 +180,6 @@
bus-range = <0x00 0xff>;
- reg = <0x40000 0x2000>, <0x80000 0x2000>;
-
- reg-names = "pcie0.0", "pcie1.0";
-
ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000 /* Port 0.0 registers */
0x82000000 0 0x80000 0x80000 0 0x00002000 /* Port 1.0 registers */
0x82000000 0 0xe0000000 0xe0000000 0 0x08000000 /* non-prefetchable memory */
OpenPOWER on IntegriCloud