Merge tag 'gpio-for-v3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

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

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 53fdde69bbf4a1254d4119629398a6f4c64ec81b..25764b505a619c7e5ff943aa3e4c6769b1256e07 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -175,10 +175,20 @@
                                };
                        };
 
+                       usbphy0: usbphy@0 {
+                               compatible = "usb-nop-xceiv";
+                               clocks = <&clks 124>;
+                               clock-names = "main_clk";
+                               status = "okay";
+                       };
+
                        usbotg: usb@73f80000 {
                                compatible = "fsl,imx51-usb", "fsl,imx27-usb";
                                reg = <0x73f80000 0x0200>;
                                interrupts = <18>;
+                               clocks = <&clks 108>;
+                               fsl,usbmisc = <&usbmisc 0>;
+                               fsl,usbphy = <&usbphy0>;
                                status = "disabled";
                        };
 
@@ -186,6 +196,8 @@
                                compatible = "fsl,imx51-usb", "fsl,imx27-usb";
                                reg = <0x73f80200 0x0200>;
                                interrupts = <14>;
+                               clocks = <&clks 108>;
+                               fsl,usbmisc = <&usbmisc 1>;
                                status = "disabled";
                        };
 
@@ -193,6 +205,8 @@
                                compatible = "fsl,imx51-usb", "fsl,imx27-usb";
                                reg = <0x73f80400 0x0200>;
                                interrupts = <16>;
+                               clocks = <&clks 108>;
+                               fsl,usbmisc = <&usbmisc 2>;
                                status = "disabled";
                        };
 
@@ -200,9 +214,18 @@
                                compatible = "fsl,imx51-usb", "fsl,imx27-usb";
                                reg = <0x73f80600 0x0200>;
                                interrupts = <17>;
+                               clocks = <&clks 108>;
+                               fsl,usbmisc = <&usbmisc 3>;
                                status = "disabled";
                        };
 
+                       usbmisc: usbmisc@73f80800 {
+                               #index-cells = <1>;
+                               compatible = "fsl,imx51-usbmisc";
+                               reg = <0x73f80800 0x200>;
+                               clocks = <&clks 108>;
+                       };
+
                        gpio1: gpio@73f84000 {
                                compatible = "fsl,imx51-gpio", "fsl,imx35-gpio";
                                reg = <0x73f84000 0x4000>;