aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Carikli <denis@eukrea.com>2014-06-25 08:41:35 -0400
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 04:49:41 -0400
commit5363dcabd3c0b3e051fd6c7a9bf44570c0cc9ee1 (patch)
tree82961658a6786c7c606f9394d3f1e5455262e707
parent1b6f23685d46151b7b450ecc17ac1a1242493351 (diff)
ARM: dts: i.MX25: Fix gpt timers clocks.
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>
-rw-r--r--arch/arm/boot/dts/imx25.dtsi8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index bb74d9582b7e..c1740396b2c9 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -312,7 +312,7 @@
312 gpt4: timer@53f84000 { 312 gpt4: timer@53f84000 {
313 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; 313 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
314 reg = <0x53f84000 0x4000>; 314 reg = <0x53f84000 0x4000>;
315 clocks = <&clks 9>, <&clks 45>; 315 clocks = <&clks 95>, <&clks 47>;
316 clock-names = "ipg", "per"; 316 clock-names = "ipg", "per";
317 interrupts = <1>; 317 interrupts = <1>;
318 }; 318 };
@@ -320,7 +320,7 @@
320 gpt3: timer@53f88000 { 320 gpt3: timer@53f88000 {
321 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; 321 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
322 reg = <0x53f88000 0x4000>; 322 reg = <0x53f88000 0x4000>;
323 clocks = <&clks 9>, <&clks 47>; 323 clocks = <&clks 94>, <&clks 47>;
324 clock-names = "ipg", "per"; 324 clock-names = "ipg", "per";
325 interrupts = <29>; 325 interrupts = <29>;
326 }; 326 };
@@ -328,7 +328,7 @@
328 gpt2: timer@53f8c000 { 328 gpt2: timer@53f8c000 {
329 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; 329 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
330 reg = <0x53f8c000 0x4000>; 330 reg = <0x53f8c000 0x4000>;
331 clocks = <&clks 9>, <&clks 47>; 331 clocks = <&clks 93>, <&clks 47>;
332 clock-names = "ipg", "per"; 332 clock-names = "ipg", "per";
333 interrupts = <53>; 333 interrupts = <53>;
334 }; 334 };
@@ -336,7 +336,7 @@
336 gpt1: timer@53f90000 { 336 gpt1: timer@53f90000 {
337 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; 337 compatible = "fsl,imx25-gpt", "fsl,imx31-gpt";
338 reg = <0x53f90000 0x4000>; 338 reg = <0x53f90000 0x4000>;
339 clocks = <&clks 9>, <&clks 47>; 339 clocks = <&clks 92>, <&clks 47>;
340 clock-names = "ipg", "per"; 340 clock-names = "ipg", "per";
341 interrupts = <54>; 341 interrupts = <54>;
342 }; 342 };