Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6qdl.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 7a8837c..6f59a99 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -45,6 +45,10 @@
                spi1 = &ecspi2;
                spi2 = &ecspi3;
                spi3 = &ecspi4;
+               usb0 = &usbotg;
+               usb1 = &usbh1;
+               usb2 = &usbh2;
+               usb3 = &usbh3;
                usbphy0 = &usbphy1;
                usbphy1 = &usbphy2;
        };
@@ -542,25 +546,25 @@
                                status = "disabled";
                        };
 
-                       can1: flexcan@2090000 {
+                       can1: can@2090000 {
                                compatible = "fsl,imx6q-flexcan";
                                reg = <0x02090000 0x4000>;
                                interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6QDL_CLK_CAN1_IPG>,
                                         <&clks IMX6QDL_CLK_CAN1_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x34 28 0x10 17>;
+                               fsl,stop-mode = <&gpr 0x34 28>;
                                status = "disabled";
                        };
 
-                       can2: flexcan@2094000 {
+                       can2: can@2094000 {
                                compatible = "fsl,imx6q-flexcan";
                                reg = <0x02094000 0x4000>;
                                interrupts = <0 111 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6QDL_CLK_CAN2_IPG>,
                                         <&clks IMX6QDL_CLK_CAN2_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x34 29 0x10 18>;
+                               fsl,stop-mode = <&gpr 0x34 29>;
                                status = "disabled";
                        };