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

[u-boot] / arch / arm / dts / fsl-ls1012a.dtsi

diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi
index c4ca9c12cbaa59959bece38f9b97db8c709df597..23b3cec43443dcf81736cb7d213087343953ff0f 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a.dtsi
+++ b/arch/arm/dts/fsl-ls1012a.dtsi
@@ -54,6 +54,22 @@
                        status = "disabled";
                };
 
+               esdhc0: esdhc@1560000 {
+                       compatible = "fsl,esdhc";
+                       reg = <0x0 0x1560000 0x0 0x10000>;
+                       interrupts = <0 62 0x4>;
+                       big-endian;
+                       bus-width = <4>;
+               };
+
+               esdhc1: esdhc@1580000 {
+                       compatible = "fsl,esdhc";
+                       reg = <0x0 0x1580000 0x0 0x10000>;
+                       interrupts = <0 65 0x4>;
+                       big-endian;
+                       non-removable;
+                       bus-width = <4>;
+               };
 
                i2c0: i2c@2180000 {
                        compatible = "fsl,vf610-i2c";
@@ -98,7 +114,7 @@
                        reg = <0x0 0x1550000 0x0 0x10000>,
                                <0x0 0x40000000 0x0 0x4000000>;
                        reg-names = "QuadSPI", "QuadSPI-memory";
-                       num-cs = <2>;
+                       num-cs = <1>;
                        big-endian;
                        status = "disabled";
                };
@@ -118,5 +134,20 @@
                        ranges = <0x81000000 0x0 0x00000000 0x40 0x00020000 0x0 0x00010000   /* downstream I/O */
                                  0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */
                };
+
+               usb0: usb2@8600000 {
+                       compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr";
+                       reg = <0x0 0x8600000 0x0 0x1000>;
+                       interrupts = <0 139 0x4>;
+                       dr_mode = "host";
+                       fsl,usb-erratum-a005697;
+               };
+
+               usb1: usb3@2f00000 {
+                       compatible = "fsl,layerscape-dwc3";
+                       reg = <0x0 0x2f00000 0x0 0x10000>;
+                       interrupts = <0 61 0x4>;
+                       dr_mode = "host";
+               };
        };
 };