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>
This commit is contained in:
Arnd Bergmann 2012-07-21 00:11:16 +02:00
commit 1fc5f7d5c6

View File

@ -278,6 +278,11 @@ key@40050000 {
status = "disabled";
};
pwm: pwm@4005C000 {
compatible = "nxp,lpc3220-pwm";
reg = <0x4005C000 0x8>;
status = "disabled";
};
};
};
};