Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f09771bc authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 90919bf2 b7d41c93
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -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>;