Merge tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

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

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 88b218f8f81049aa8f787fa511639cea250ea461..442e216ca9d96ef5b8b81fc85bd3a45f723c35e0 100644 (file)
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -13,6 +13,7 @@
 
 / {
        aliases {
+               ethernet0 = &fec;
                gpio0 = &gpio1;
                gpio1 = &gpio2;
                gpio2 = &gpio3;
@@ -192,6 +193,14 @@
                                #clock-cells = <1>;
                        };
 
+                       gpt: timer@53f90000 {
+                               compatible = "fsl,imx35-gpt", "fsl,imx31-gpt";
+                               reg = <0x53f90000 0x4000>;
+                               interrupts = <29>;
+                               clocks = <&clks 9>, <&clks 50>;
+                               clock-names = "ipg", "per";
+                       };
+
                        gpio3: gpio@53fa4000 {
                                compatible = "fsl,imx35-gpio", "fsl,imx31-gpio";
                                reg = <0x53fa4000 0x4000>;
@@ -295,9 +304,9 @@
                                compatible = "fsl,imx35-usb", "fsl,imx27-usb";
                                reg = <0x53ff4000 0x0200>;
                                interrupts = <37>;
-                               clocks = <&clks 9>, <&clks 73>, <&clks 28>;
-                               clock-names = "ipg", "ahb", "per";
+                               clocks = <&clks 73>;
                                fsl,usbmisc = <&usbmisc 0>;
+                               fsl,usbphy = <&usbphy0>;
                                status = "disabled";
                        };
 
@@ -305,9 +314,9 @@
                                compatible = "fsl,imx35-usb", "fsl,imx27-usb";
                                reg = <0x53ff4400 0x0200>;
                                interrupts = <35>;
-                               clocks = <&clks 9>, <&clks 73>, <&clks 28>;
-                               clock-names = "ipg", "ahb", "per";
+                               clocks = <&clks 73>;
                                fsl,usbmisc = <&usbmisc 1>;
+                               fsl,usbphy = <&usbphy1>;
                                status = "disabled";
                        };
 
@@ -356,4 +365,20 @@
                        };
                };
        };
+
+       usbphy {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               usbphy0: usb-phy@0 {
+                       reg = <0>;
+                       compatible = "usb-nop-xceiv";
+               };
+
+               usbphy1: usb-phy@1 {
+                       reg = <1>;
+                       compatible = "usb-nop-xceiv";
+               };
+       };
 };