Merge tag 'trace-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / vf610.dtsi

diff --git a/arch/arm/boot/dts/vf610.dtsi b/arch/arm/boot/dts/vf610.dtsi
index 583dd363c9dc4e3c78a5f0c4a16bf20450998249..4d2ec32de96f408f5e7b9b6c383cbde06fe566a5 100644 (file)
--- a/arch/arm/boot/dts/vf610.dtsi
+++ b/arch/arm/boot/dts/vf610.dtsi
@@ -27,6 +27,8 @@
                gpio2 = &gpio3;
                gpio3 = &gpio4;
                gpio4 = &gpio5;
+               usbphy0 = &usbphy0;
+               usbphy1 = &usbphy1;
        };
 
        cpus {
@@ -297,9 +299,25 @@
                                gpio-ranges = <&iomuxc 0 128 7>;
                        };
 
-                       anatop@40050000 {
-                               compatible = "fsl,vf610-anatop";
-                               reg = <0x40050000 0x1000>;
+                       anatop: anatop@40050000 {
+                               compatible = "fsl,vf610-anatop", "syscon";
+                               reg = <0x40050000 0x400>;
+                       };
+
+                       usbphy0: usbphy@40050800 {
+                               compatible = "fsl,vf610-usbphy";
+                               reg = <0x40050800 0x400>;
+                               interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks VF610_CLK_USBPHY0>;
+                               fsl,anatop = <&anatop>;
+                       };
+
+                       usbphy1: usbphy@40050c00 {
+                               compatible = "fsl,vf610-usbphy";
+                               reg = <0x40050c00 0x400>;
+                               interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks VF610_CLK_USBPHY1>;
+                               fsl,anatop = <&anatop>;
                        };
 
                        i2c0: i2c@40066000 {
@@ -321,6 +339,24 @@
                                reg = <0x4006b000 0x1000>;
                                #clock-cells = <1>;
                        };
+
+                       usbdev0: usb@40034000 {
+                               compatible = "fsl,vf610-usb", "fsl,imx27-usb";
+                               reg = <0x40034000 0x800>;
+                               interrupts = <0 75 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks VF610_CLK_USBC0>;
+                               fsl,usbphy = <&usbphy0>;
+                               fsl,usbmisc = <&usbmisc0 0>;
+                               dr_mode = "peripheral";
+                               status = "disabled";
+                       };
+
+                       usbmisc0: usb@40034800 {
+                               #index-cells = <1>;
+                               compatible = "fsl,vf610-usbmisc";
+                               reg = <0x40034800 0x200>;
+                               clocks = <&clks VF610_CLK_USBC0>;
+                       };
                };
 
                aips1: aips-bus@40080000 {
@@ -383,6 +419,24 @@
                                status = "disabled";
                        };
 
+                       usbh1: usb@400b4000 {
+                               compatible = "fsl,vf610-usb", "fsl,imx27-usb";
+                               reg = <0x400b4000 0x800>;
+                               interrupts = <0 76 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&clks VF610_CLK_USBC1>;
+                               fsl,usbphy = <&usbphy1>;
+                               fsl,usbmisc = <&usbmisc1 0>;
+                               dr_mode = "host";
+                               status = "disabled";
+                       };
+
+                       usbmisc1: usb@400b4800 {
+                               #index-cells = <1>;
+                               compatible = "fsl,vf610-usbmisc";
+                               reg = <0x400b4800 0x200>;
+                               clocks = <&clks VF610_CLK_USBC1>;
+                       };
+
                        ftm: ftm@400b8000 {
                                compatible = "fsl,ftm-timer";
                                reg = <0x400b8000 0x1000 0x400b9000 0x1000>;