Skip to content

Commit

Permalink
Merge branch 'lpc32xx/dts2' of git://git.antcom.de/linux-2.6 into nex…
Browse files Browse the repository at this point in the history
…t/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>
  • Loading branch information
Arnd Bergmann committed Jul 20, 2012
2 parents d0b1a03 + de63985 commit 1fc5f7d
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/lpc32xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,11 @@
status = "disabled";
};

pwm: pwm@4005C000 {
compatible = "nxp,lpc3220-pwm";
reg = <0x4005C000 0x8>;
status = "disabled";
};
};
};
};

0 comments on commit 1fc5f7d

Please sign in to comment.