]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: i.MX25: Fix gpt timers clocks.
authorDenis Carikli <denis@eukrea.com>
Wed, 25 Jun 2014 12:41:35 +0000 (14:41 +0200)
committerShawn Guo <shawn.guo@freescale.com>
Fri, 18 Jul 2014 08:49:41 +0000 (16:49 +0800)
Without that fix, the board freeze during boot.

This appeared after the following commit:
  496f065 ARM: i.MX: Use of_clk_get_by_name() for timer clocks for DT case.

Signed-off-by: Denis Carikli <denis@eukrea.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
arch/arm/boot/dts/imx25.dtsi

index bb74d9582b7e2e0627acf7f3a9adb75bc299f9f5..c1740396b2c95ef8f0860ae5c4ce5c829a22ecab 100644 (file)
@@ -312,7 +312,7 @@ clks: ccm@53f80000 {
                        gpt4: timer@53f84000 {
                                compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                reg = <0x53f84000 0x4000>;
-                               clocks = <&clks 9>, <&clks 45>;
+                               clocks = <&clks 95>, <&clks 47>;
                                clock-names = "ipg", "per";
                                interrupts = <1>;
                        };
@@ -320,7 +320,7 @@ gpt4: timer@53f84000 {
                        gpt3: timer@53f88000 {
                                compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                reg = <0x53f88000 0x4000>;
-                               clocks = <&clks 9>, <&clks 47>;
+                               clocks = <&clks 94>, <&clks 47>;
                                clock-names = "ipg", "per";
                                interrupts = <29>;
                        };
@@ -328,7 +328,7 @@ gpt3: timer@53f88000 {
                        gpt2: timer@53f8c000 {
                                compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                reg = <0x53f8c000 0x4000>;
-                               clocks = <&clks 9>, <&clks 47>;
+                               clocks = <&clks 93>, <&clks 47>;
                                clock-names = "ipg", "per";
                                interrupts = <53>;
                        };
@@ -336,7 +336,7 @@ gpt2: timer@53f8c000 {
                        gpt1: timer@53f90000 {
                                compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
                                reg = <0x53f90000 0x4000>;
-                               clocks = <&clks 9>, <&clks 47>;
+                               clocks = <&clks 92>, <&clks 47>;
                                clock-names = "ipg", "per";
                                interrupts = <54>;
                        };