Commit 1fc5f7d5 authored Jul 21, 2012 by Arnd Bergmann

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>

parents d0b1a037 de639854

arch/arm/boot/dts/lpc32xx.dtsi

+5 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,11 @@
		status = "disabled";
		};

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