6 files changed, 13 insertions, 21 deletions

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 58d3c3cf2923..d238676a9107 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -162,7 +162,7 @@
                                 #size-cells = <0>;
                                 compatible = "fsl,imx25-cspi", "fsl,imx35-cspi";
                                 reg = <0x43fa4000 0x4000>;
-                                clocks = <&clks 62>, <&clks 62>;
+                                clocks = <&clks 78>, <&clks 78>;
                                 clock-names = "ipg", "per";
                                 interrupts = <14>;
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 56569cecaa78..649befeb2cf9 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -127,24 +127,12 @@
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                reg_usbh1_vbus: regulator@0 {
-                        compatible = "regulator-fixed";
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&pinctrl_usbh1reg>;
-                        reg = <0>;
-                        regulator-name = "usbh1_vbus";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>;
-                        enable-active-high;
-                };
-
-                reg_usbotg_vbus: regulator@1 {
+                reg_hub_reset: regulator@0 {
                         compatible = "regulator-fixed";
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_usbotgreg>;
-                        reg = <1>;
-                        regulator-name = "usbotg_vbus";
+                        reg = <0>;
+                        regulator-name = "hub_reset";
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
                         gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
@@ -176,6 +164,7 @@
                         reg = <0>;
                         clocks = <&clks IMX5_CLK_DUMMY>;
                         clock-names = "main_clk";
+                        reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
                 };
         };
 };
@@ -419,7 +408,7 @@
 &usbh1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_usbh1>;
-        vbus-supply = <&reg_usbh1_vbus>;
+        vbus-supply = <&reg_hub_reset>;
         fsl,usbphy = <&usbh1phy>;
         phy_type = "ulpi";
         status = "okay";
@@ -429,7 +418,6 @@
         dr_mode = "otg";
         disable-over-current;
         phy_type = "utmi_wide";
-        vbus-supply = <&reg_usbotg_vbus>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 4fc03b7f1cee..2109d0763c1b 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -335,8 +335,8 @@
                         vpu: vpu@02040000 {
                                 compatible = "cnm,coda960";
                                 reg = <0x02040000 0x3c000>;
-                                interrupts = <0 3 IRQ_TYPE_LEVEL_HIGH>,
-                                             <0 12 IRQ_TYPE_LEVEL_HIGH>;
+                                interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>,
+                                             <0 3 IRQ_TYPE_LEVEL_HIGH>;
                                 interrupt-names = "bit", "jpeg";
                                 clocks = <&clks IMX6QDL_CLK_VPU_AXI>,
                                          <&clks IMX6QDL_CLK_MMDC_CH0_AXI>,
diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
index 657da14cb4b5..c70bb27ac65a 100644
--- a/arch/arm/boot/dts/ls1021a.dtsi
+++ b/arch/arm/boot/dts/ls1021a.dtsi
@@ -142,6 +142,7 @@
                 scfg: scfg@1570000 {
                         compatible = "fsl,ls1021a-scfg", "syscon";
                         reg = <0x0 0x1570000 0x0 0x10000>;
+                        big-endian;
                 };
 
                 clockgen: clocking@1ee1000 {
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 5951660d1bd2..2daef619d053 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -144,7 +144,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
                 post_div_table[1].div = 1;
                 post_div_table[2].div = 1;
                 video_div_table[1].div = 1;
-                video_div_table[2].div = 1;
+                video_div_table[3].div = 1;
         }
 
         clk[IMX6QDL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
diff --git a/arch/arm/mach-imx/clk-imx6sx.c b/arch/arm/mach-imx/clk-imx6sx.c
index 17354a11356f..5a3e5a159e70 100644
--- a/arch/arm/mach-imx/clk-imx6sx.c
+++ b/arch/arm/mach-imx/clk-imx6sx.c
@@ -558,6 +558,9 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node)
         clk_set_parent(clks[IMX6SX_CLK_GPU_CORE_SEL], clks[IMX6SX_CLK_PLL3_PFD0]);
         clk_set_parent(clks[IMX6SX_CLK_GPU_AXI_SEL], clks[IMX6SX_CLK_PLL3_PFD0]);
 
+        clk_set_parent(clks[IMX6SX_CLK_QSPI1_SEL], clks[IMX6SX_CLK_PLL2_BUS]);
+        clk_set_parent(clks[IMX6SX_CLK_QSPI2_SEL], clks[IMX6SX_CLK_PLL2_BUS]);
+
         /* Set initial power mode */
         imx6q_set_lpm(WAIT_CLOCKED);
 }