diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 00:11:16 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 00:11:16 +0200 |
| commit | 1fc5f7d5c680ac36bd41e13a3d77cbe2eaa312e0 (patch) | |
| tree | eb03e3531bab2044681a9f16bd19f4550a4b8cf6 | |
| parent | d0b1a03704820d7e6ebff35237ac0968303f05a2 (diff) | |
| parent | de639854441af37fc88a72daab5842045d518944 (diff) | |
| download | blackbird-obmc-linux-1fc5f7d5c680ac36bd41e13a3d77cbe2eaa312e0.tar.gz blackbird-obmc-linux-1fc5f7d5c680ac36bd41e13a3d77cbe2eaa312e0.zip | |
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.dtsi | 5 |
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 @@ status = "disabled"; }; + pwm: pwm@4005C000 { + compatible = "nxp,lpc3220-pwm"; + reg = <0x4005C000 0x8>; + status = "disabled"; + }; }; }; }; |
