Merge branch 'master' into fixes

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6sl.dtsi

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 7a3ae7160c129305d3e131fe6e59530d7c64e1f0..e7524e73efb42a50a33f787d6c4196b7083f494b 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -13,10 +13,8 @@
         * The decompressor and also some bootloaders rely on a
         * pre-existing /chosen node to be available to insert the
         * command line and merge other ATAGS info.
-        * Also for U-Boot there must be a pre-existing /memory node.
         */
        chosen {};
-       memory { device_type = "memory"; };
 
        aliases {
                ethernet0 = &fec;
@@ -110,6 +108,11 @@
                interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
        };
 
+       usbphynop1: usbphynop1 {
+               compatible = "usb-nop-xceiv";
+               #phy-cells = <0>;
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -588,7 +591,6 @@
                                        regulator-name = "vddpu";
                                        regulator-min-microvolt = <725000>;
                                        regulator-max-microvolt = <1450000>;
-                                       regulator-always-on;
                                        anatop-reg-offset = <0x140>;
                                        anatop-vol-bit-shift = <9>;
                                        anatop-vol-bit-width = <5>;
@@ -815,6 +817,8 @@
                                reg = <0x02184400 0x200>;
                                interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SL_CLK_USBOH3>;
+                               fsl,usbphy = <&usbphynop1>;
+                               phy_type = "hsic";
                                fsl,usbmisc = <&usbmisc 2>;
                                dr_mode = "host";
                                ahb-burst-config = <0x0>;
@@ -921,6 +925,7 @@
                        mmdc: mmdc@21b0000 {
                                compatible = "fsl,imx6sl-mmdc", "fsl,imx6q-mmdc";
                                reg = <0x021b0000 0x4000>;
+                               clocks = <&clks IMX6SL_CLK_MMDC_P0_IPG>;
                        };
 
                        rngb: rngb@21b4000 {