From aacb1c44c3f3150a1d2bbe1f3d01f96795654d7d Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 14 Mar 2013 13:08:57 +0100 Subject: [PATCH] --- yaml --- r: 370463 b: refs/heads/master c: ca26d04143dfa9d2eff11fdafe76eee595e9ee14 h: refs/heads/master i: 370461: c65715feb50434b8d6211d2d2e66360351bb2a75 370459: 14a1cc67351d27710af862830410c8f762f8bef1 370455: e0f970d908d85490cd9cca42446a2228d074b620 370447: 92e345b74262fec2c986a67c6b878d1c32f8995f 370431: 65f9c17465b7bc5f169c78350aebf0fafa343939 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx27.dtsi | 37 +++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d9b21dc40a6c..cdffb8f61679 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c21e5ca87400ceed04e7033a1848fda5d7e0e5f2 +refs/heads/master: ca26d04143dfa9d2eff11fdafe76eee595e9ee14 diff --git a/trunk/arch/arm/boot/dts/imx27.dtsi b/trunk/arch/arm/boot/dts/imx27.dtsi index c3bdc72150d6..387aab6937e3 100644 --- a/trunk/arch/arm/boot/dts/imx27.dtsi +++ b/trunk/arch/arm/boot/dts/imx27.dtsi @@ -60,11 +60,29 @@ wdog: wdog@10002000 { compatible = "fsl,imx27-wdt", "fsl,imx21-wdt"; - reg = <0x10002000 0x4000>; + reg = <0x10002000 0x1000>; interrupts = <27>; clocks = <&clks 0>; }; + gpt1: timer@10003000 { + compatible = "fsl,imx27-gpt", "fsl,imx1-gpt"; + reg = <0x10003000 0x1000>; + interrupts = <26>; + }; + + gpt2: timer@10004000 { + compatible = "fsl,imx27-gpt", "fsl,imx1-gpt"; + reg = <0x10004000 0x1000>; + interrupts = <25>; + }; + + gpt3: timer@10005000 { + compatible = "fsl,imx27-gpt", "fsl,imx1-gpt"; + reg = <0x10005000 0x1000>; + interrupts = <24>; + }; + uart1: serial@1000a000 { compatible = "fsl,imx27-uart", "fsl,imx21-uart"; reg = <0x1000a000 0x1000>; @@ -204,6 +222,18 @@ status = "disabled"; }; + gpt4: timer@10019000 { + compatible = "fsl,imx27-gpt", "fsl,imx1-gpt"; + reg = <0x10019000 0x1000>; + interrupts = <4>; + }; + + gpt5: timer@1001a000 { + compatible = "fsl,imx27-gpt", "fsl,imx1-gpt"; + reg = <0x1001a000 0x1000>; + interrupts = <3>; + }; + uart5: serial@1001b000 { compatible = "fsl,imx27-uart", "fsl,imx21-uart"; reg = <0x1001b000 0x1000>; @@ -232,6 +262,11 @@ status = "disabled"; }; + gpt6: timer@1001f000 { + compatible = "fsl,imx27-gpt", "fsl,imx1-gpt"; + reg = <0x1001f000 0x1000>; + interrupts = <2>; + }; }; aipi@10020000 { /* AIPI2 */