Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / armada-370-rd.dts

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index fbef730e8d379df92d735c2e98fbaf2af0851cc9..c3fd6e49212ff5edea6df2f521bf2f527d7e9d66 100644 (file)
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -67,7 +67,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x00000000 0x20000000>; /* 512 MB */
        };
@@ -77,22 +77,6 @@
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000
                          MBUS_ID(0x09, 0x01) 0 0xf1100000 0x10000>;
 
-               pcie-controller {
-                       status = "okay";
-
-                       /* Internal mini-PCIe connector */
-                       pcie@1,0 {
-                               /* Port 0, Lane 0 */
-                               status = "okay";
-                       };
-
-                       /* Internal mini-PCIe connector */
-                       pcie@2,0 {
-                               /* Port 1, Lane 0 */
-                               status = "okay";
-                       };
-               };
-
                internal-regs {
                        serial@12000 {
                                status = "okay";
@@ -102,14 +86,6 @@
                                status = "okay";
                        };
 
-                       mdio {
-                               pinctrl-0 = <&mdio_pins>;
-                               pinctrl-names = "default";
-                               phy0: ethernet-phy@0 {
-                                       reg = <0>;
-                               };
-                       };
-
                        ethernet@70000 {
                                status = "okay";
                                phy = <&phy0>;
@@ -146,7 +122,7 @@
                                compatible = "gpio-keys";
                                #address-cells = <1>;
                                #size-cells = <0>;
-                               button@1 {
+                               button {
                                        label = "Software Button";
                                        linux,code = <KEY_POWER>;
                                        gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -196,7 +172,7 @@
                };
        };
 
-       dsa@0 {
+       dsa {
                compatible = "marvell,dsa";
                #address-cells = <2>;
                #size-cells = <0>;
@@ -235,7 +211,32 @@
                        };
                };
         };
- };
+};
+
+&pciec {
+       status = "okay";
+
+       /* Internal mini-PCIe connector */
+       pcie@1,0 {
+               /* Port 0, Lane 0 */
+               status = "okay";
+       };
+
+       /* Internal mini-PCIe connector */
+       pcie@2,0 {
+               /* Port 1, Lane 0 */
+               status = "okay";
+       };
+};
+
+&mdio {
+       pinctrl-0 = <&mdio_pins>;
+       pinctrl-names = "default";
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+};
+
 
 &pinctrl {
        fan_pins: fan-pins {