aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-07-20 18:11:16 -0400
committerArnd Bergmann <arnd@arndb.de>2012-07-20 18:11:16 -0400
commit1fc5f7d5c680ac36bd41e13a3d77cbe2eaa312e0 (patch)
treeeb03e3531bab2044681a9f16bd19f4550a4b8cf6
parentd0b1a03704820d7e6ebff35237ac0968303f05a2 (diff)
parentde639854441af37fc88a72daab5842045d518944 (diff)
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into next/dt
From Roland Stigge <stigge@antcom.de>: this is a late addition to LPC32xx DTS files for v3.6. * 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6: ARM: LPC32xx: Add PWM to base dts file Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/boot/dts/lpc32xx.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi
index c5f37fbd33e6..e5ffe960dbf3 100644
--- a/arch/arm/boot/dts/lpc32xx.dtsi
+++ b/arch/arm/boot/dts/lpc32xx.dtsi
@@ -278,6 +278,11 @@
278 status = "disabled"; 278 status = "disabled";
279 }; 279 };
280 280
281 pwm: pwm@4005C000 {
282 compatible = "nxp,lpc3220-pwm";
283 reg = <0x4005C000 0x8>;
284 status = "disabled";
285 };
281 }; 286 };
282 }; 287 };
283}; 288};