Merge tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Merge "ARM: imx: fixes for 3.19, 2nd round" from Shawn Guo:

The i.MX fixes for 3.19, 2nd round:
 - Correct pwm clock assignment in i.MX25 device tree to fix the broken
   pwm support on i.MX25

* tag 'imx-fixes-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx25: Fix PWM "per" clocks

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index d238676a9107..e4d3aecc4ed2 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -369,7 +369,7 @@
                                 compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
                                 #pwm-cells = <2>;
                                 reg = <0x53fa0000 0x4000>;
-                                clocks = <&clks 106>, <&clks 36>;
+                                clocks = <&clks 106>, <&clks 52>;
                                 clock-names = "ipg", "per";
                                 interrupts = <36>;
                         };
@@ -388,7 +388,7 @@
                                 compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
                                 #pwm-cells = <2>;
                                 reg = <0x53fa8000 0x4000>;
-                                clocks = <&clks 107>, <&clks 36>;
+                                clocks = <&clks 107>, <&clks 52>;
                                 clock-names = "ipg", "per";
                                 interrupts = <41>;
                         };
@@ -429,7 +429,7 @@
                         pwm4: pwm@53fc8000 {
                                 compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
                                 reg = <0x53fc8000 0x4000>;
-                                clocks = <&clks 108>, <&clks 36>;
+                                clocks = <&clks 108>, <&clks 52>;
                                 clock-names = "ipg", "per";
                                 interrupts = <42>;
                         };
@@ -476,7 +476,7 @@
                                 compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
                                 #pwm-cells = <2>;
                                 reg = <0x53fe0000 0x4000>;
-                                clocks = <&clks 105>, <&clks 36>;
+                                clocks = <&clks 105>, <&clks 52>;
                                 clock-names = "ipg", "per";
                                 interrupts = <26>;
                         };