Skip to content

Commit

Permalink
Merge tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6 into…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Olof Johansson committed Nov 21, 2012
2 parents 90919bf + b7d41c9 commit f09771b
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/arm/boot/dts/lpc32xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,13 @@
pnx,timeout = <0x64>;
};

mpwm: mpwm@400E8000 {
compatible = "nxp,lpc3220-motor-pwm";
reg = <0x400E8000 0x78>;
status = "disabled";
#pwm-cells = <2>;
};

i2cusb: i2c@31020300 {
compatible = "nxp,pnx-i2c";
reg = <0x31020300 0x100>;
Expand Down

0 comments on commit f09771b

Please sign in to comment.