Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.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..90b117624abb2230105855b70fbdf313fa73a05e 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>;
                };
        };
 
@@ -80,7 +89,7 @@
 
                        sata@a0000 {
                                compatible = "marvell,orion-sata";
-                               reg = <0xa0000 0x2400>;
+                               reg = <0xa0000 0x5000>;
                                interrupts = <55>;
                                clocks = <&gateclk 15>, <&gateclk 30>;
                                clock-names = "0", "1";
@@ -94,17 +103,17 @@
                                reg = <0x72004 0x4>;
                        };
 
-                       ethernet@70000 {
+                       eth0: ethernet@70000 {
                                compatible = "marvell,armada-370-neta";
-                               reg = <0x70000 0x2500>;
+                               reg = <0x70000 0x4000>;
                                interrupts = <8>;
                                clocks = <&gateclk 4>;
                                status = "disabled";
                        };
 
-                       ethernet@74000 {
+                       eth1: ethernet@74000 {
                                compatible = "marvell,armada-370-neta";
-                               reg = <0x74000 0x2500>;
+                               reg = <0x74000 0x4000>;
                                interrupts = <10>;
                                clocks = <&gateclk 3>;
                                status = "disabled";
@@ -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";
                        };