From aa0e73e0269d7b0c34a48e4df7d3742ee3eb3c9a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 19 Nov 2012 00:57:08 +0100 Subject: [PATCH] --- yaml --- r: 340131 b: refs/heads/master c: 82a618da1bc21dd9ff9a6fa66acbd7ec545b72c5 h: refs/heads/master i: 340129: 3afe36240ac505227f05aac63bb8c5514e8eb203 340127: b31918b7dabd54f4f8f536c3d91323c9ec35035a v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx51.dtsi | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 49d46dd76898..c81658c49975 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ae90afaeba3469eccce140fb0a1d5fa5c816ddc +refs/heads/master: 82a618da1bc21dd9ff9a6fa66acbd7ec545b72c5 diff --git a/trunk/arch/arm/boot/dts/imx51.dtsi b/trunk/arch/arm/boot/dts/imx51.dtsi index 8cf69c702553..2781e47cff0d 100644 --- a/trunk/arch/arm/boot/dts/imx51.dtsi +++ b/trunk/arch/arm/boot/dts/imx51.dtsi @@ -409,6 +409,24 @@ }; }; + pwm1: pwm@73fb4000 { + #pwm-cells = <2>; + compatible = "fsl,imx51-pwm", "fsl,imx27-pwm"; + reg = <0x73fb4000 0x4000>; + clocks = <&clks 37>, <&clks 38>; + clock-names = "ipg", "per"; + interrupts = <61>; + }; + + pwm2: pwm@73fb8000 { + #pwm-cells = <2>; + compatible = "fsl,imx51-pwm", "fsl,imx27-pwm"; + reg = <0x73fb8000 0x4000>; + clocks = <&clks 39>, <&clks 40>; + clock-names = "ipg", "per"; + interrupts = <94>; + }; + uart1: serial@73fbc000 { compatible = "fsl,imx51-uart", "fsl,imx21-uart"; reg = <0x73fbc000 0x4000>;