Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / arm / dts / ls1021a.dtsi

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index 5b3fc6ad44da2523b7ebdf26e1c5b11ea94a6033..e419d9c44fcb008fd39541857179a2d99dca5870 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -96,7 +96,6 @@
                        sdhci,auto-cmd12;
                        big-endian;
                        bus-width = <4>;
-                       status = "disabled";
                };
 
                scfg: scfg@1570000 {
@@ -351,12 +350,36 @@
                                 <&platform_clk 1>;
                };
 
+               enet0: ethernet@2d10000 {
+                       compatible = "fsl,etsec2";
+                       reg = <0x2d10000 0x1000>;
+                       status = "disabled";
+               };
+
+               enet1: ethernet@2d50000 {
+                       compatible = "fsl,etsec2";
+                       reg = <0x2d50000 0x1000>;
+                       status = "disabled";
+               };
+
+               enet2: ethernet@2d90000 {
+                       compatible = "fsl,etsec2";
+                       reg = <0x2d90000 0x1000>;
+                       status = "disabled";
+               };
+
                mdio0: mdio@2d24000 {
-                       compatible = "gianfar";
-                       device_type = "mdio";
+                       compatible = "fsl,etsec2-mdio";
+                       reg = <0x2d24000 0x4000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
+               mdio1: mdio@2d64000 {
+                       compatible = "fsl,etsec2-mdio";
+                       reg = <0x2d64000 0x4000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       reg = <0x2d24000 0x4000>;
                };
 
                usb@8600000 {
@@ -404,5 +427,13 @@
                        ranges = <0x81000000 0x0 0x00000000 0x34020000 0x0 0x00010000   /* downstream I/O */
                                  0x82000000 0x0 0x38000000 0x38000000 0x0 0x08000000>; /* non-prefetchable memory */
                };
+
+               sata: sata@3200000 {
+                       compatible = "fsl,ls1021a-ahci";
+                       reg = <0x3200000 0x10000 0x20220520 0x4>;
+                       reg-names = "sata-base", "ecc-addr";
+                       interrupts = <0 101 4>;
+                       status = "disabled";
+               };
        };
 };