Merge branch 'pm-cpufreq-fixes'

[deliverable/linux.git] / arch / arm / boot / dts / imx6sx.dtsi

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 167f77b3bd43654c45d181e2a7f31965f6f1c946..a5f76025a0ce9196569cb0f140740b952933407a 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -222,7 +222,7 @@
                                                      "rxtx1", "rxtx2",
                                                      "rxtx3", "rxtx4",
                                                      "rxtx5", "rxtx6",
-                                                     "rxtx7", "dma";
+                                                     "rxtx7", "spba";
                                        status = "disabled";
                                };
 
@@ -295,7 +295,7 @@
                                                 <&clks IMX6SX_CLK_ESAI_IPG>,
                                                 <&clks IMX6SX_CLK_SPBA>;
                                        clock-names = "core", "mem", "extal",
-                                                     "fsys", "dma";
+                                                     "fsys", "spba";
                                        status = "disabled";
                                };
 
@@ -348,7 +348,7 @@
                                                 <&clks IMX6SX_CLK_ASRC_IPG>,
                                                 <&clks IMX6SX_CLK_SPDIF>,
                                                 <&clks IMX6SX_CLK_SPBA>;
-                                       clock-names = "mem", "ipg", "asrck", "dma";
+                                       clock-names = "mem", "ipg", "asrck", "spba";
                                        dmas = <&sdma 17 20 1>, <&sdma 18 20 1>,
                                               <&sdma 19 20 1>, <&sdma 20 20 1>,
                                               <&sdma 21 20 1>, <&sdma 22 20 1>;
@@ -783,6 +783,9 @@
                                fsl,usbphy = <&usbphy1>;
                                fsl,usbmisc = <&usbmisc 0>;
                                fsl,anatop = <&anatop>;
+                               ahb-burst-config = <0x0>;
+                               tx-burst-size-dword = <0x10>;
+                               rx-burst-size-dword = <0x10>;
                                status = "disabled";
                        };
 
@@ -793,6 +796,9 @@
                                clocks = <&clks IMX6SX_CLK_USBOH3>;
                                fsl,usbphy = <&usbphy2>;
                                fsl,usbmisc = <&usbmisc 1>;
+                               ahb-burst-config = <0x0>;
+                               tx-burst-size-dword = <0x10>;
+                               rx-burst-size-dword = <0x10>;
                                status = "disabled";
                        };
 
@@ -805,6 +811,9 @@
                                phy_type = "hsic";
                                fsl,anatop = <&anatop>;
                                dr_mode = "host";
+                               ahb-burst-config = <0x0>;
+                               tx-burst-size-dword = <0x10>;
+                               rx-burst-size-dword = <0x10>;
                                status = "disabled";
                        };
 
@@ -1152,6 +1161,8 @@
                                interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_IPG>;
                                clock-names = "adc";
+                               fsl,adck-max-frequency = <30000000>, <40000000>,
+                                                        <20000000>;
                                status = "disabled";
                         };
 
@@ -1161,6 +1172,8 @@
                                interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_IPG>;
                                clock-names = "adc";
+                               fsl,adck-max-frequency = <30000000>, <40000000>,
+                                                        <20000000>;
                                status = "disabled";
                         };