diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 03:51:49 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 03:52:03 -0500 |
commit | f09771bcd29770a763980439ff0ac4fbbaf691e6 (patch) | |
tree | cb0b83fff7901e65ddbbee9694b649194e22bd78 | |
parent | 90919bf2149a2e988ab295d7266b1608d42f21af (diff) | |
parent | b7d41c937ed742b0995e4824ed2d0be085f80c1d (diff) |
Merge tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6 into next/dt
From Roland Stigge:
DTS updates for the LPC32xx Soc for 3.7
This time, only one patch: Adding the motor PWM to lpc32xx.dtsi
* tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6:
ARM: LPC32xx: Add the motor PWM to base dts file
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/boot/dts/lpc32xx.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/lpc32xx.dtsi b/arch/arm/boot/dts/lpc32xx.dtsi index e5ffe960dbf3..1582f484a867 100644 --- a/arch/arm/boot/dts/lpc32xx.dtsi +++ b/arch/arm/boot/dts/lpc32xx.dtsi | |||
@@ -182,6 +182,13 @@ | |||
182 | pnx,timeout = <0x64>; | 182 | pnx,timeout = <0x64>; |
183 | }; | 183 | }; |
184 | 184 | ||
185 | mpwm: mpwm@400E8000 { | ||
186 | compatible = "nxp,lpc3220-motor-pwm"; | ||
187 | reg = <0x400E8000 0x78>; | ||
188 | status = "disabled"; | ||
189 | #pwm-cells = <2>; | ||
190 | }; | ||
191 | |||
185 | i2cusb: i2c@31020300 { | 192 | i2cusb: i2c@31020300 { |
186 | compatible = "nxp,pnx-i2c"; | 193 | compatible = "nxp,pnx-i2c"; |
187 | reg = <0x31020300 0x100>; | 194 | reg = <0x31020300 0x100>; |