Merge tag 'dt-3.11-5' of git://git.infradead.org/users/jcooper/linux into next/dt

[karo-tx-linux.git] / arch / arm / boot / dts / armada-370-xp.dtsi

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 550eb772c30e4c47c2f7f0896469a033dee3e23b..a679b6697a981c69b962784a752a128166fb7769 100644 (file)
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -22,9 +22,18 @@
        model = "Marvell Armada 370 and XP SoC";
        compatible = "marvell,armada-370-xp";
 
+       aliases {
+               eth0 = &eth0;
+               eth1 = &eth1;
+       };
+
        cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
                cpu@0 {
                        compatible = "marvell,sheeva-v7";
+                       device_type = "cpu";
+                       reg = <0>;
                };
        };
 
@@ -94,7 +103,7 @@
                                reg = <0x72004 0x4>;
                        };
 
-                       ethernet@70000 {
+                       eth0: ethernet@70000 {
                                compatible = "marvell,armada-370-neta";
                                reg = <0x70000 0x2500>;
                                interrupts = <8>;
@@ -102,7 +111,7 @@
                                status = "disabled";
                        };
 
-                       ethernet@74000 {
+                       eth1: ethernet@74000 {
                                compatible = "marvell,armada-370-neta";
                                reg = <0x74000 0x2500>;
                                interrupts = <10>;
@@ -143,6 +152,10 @@
                                reg = <0xd4000 0x200>;
                                interrupts = <54>;
                                clocks = <&gateclk 17>;
+                               bus-width = <4>;
+                               cap-sdio-irq;
+                               cap-sd-highspeed;
+                               cap-mmc-highspeed;
                                status = "disabled";
                        };