diff --git a/[refs] b/[refs]
index c4dad1a1a7a2..9b6fdbfdb819 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 166091b1894df3de736f43c649f2e6639f4a31ac
+refs/heads/master: 824b16e66b70f5df61345f5708c149f6886eef30
diff --git a/trunk/arch/arm/mach-mx2/devices.c b/trunk/arch/arm/mach-mx2/devices.c
index 684d5d92c2e4..bef418e0e60e 100644
--- a/trunk/arch/arm/mach-mx2/devices.c
+++ b/trunk/arch/arm/mach-mx2/devices.c
@@ -281,6 +281,26 @@ struct platform_device mxc_fec_device = {
 };
 #endif
 
+static struct resource mxc_pwm_resources[] = {
+	[0] = {
+		.start	= PWM_BASE_ADDR,
+		.end	= PWM_BASE_ADDR + 0x0fff,
+		.flags	= IORESOURCE_MEM
+	},
+	[1] = {
+		.start   = MXC_INT_PWM,
+		.end     = MXC_INT_PWM,
+		.flags   = IORESOURCE_IRQ,
+	}
+};
+
+struct platform_device mxc_pwm_device = {
+	.name = "mxc_pwm",
+	.id = 0,
+	.num_resources = ARRAY_SIZE(mxc_pwm_resources),
+	.resource = mxc_pwm_resources
+};
+
 /* GPIO port description */
 static struct mxc_gpio_port imx_gpio_ports[] = {
 	[0] = {
diff --git a/trunk/arch/arm/mach-mx2/devices.h b/trunk/arch/arm/mach-mx2/devices.h
index d85d5b26c986..94a241419af7 100644
--- a/trunk/arch/arm/mach-mx2/devices.h
+++ b/trunk/arch/arm/mach-mx2/devices.h
@@ -15,3 +15,4 @@ extern struct platform_device mxc_w1_master_device;
 extern struct platform_device mxc_nand_device;
 extern struct platform_device mxc_fb_device;
 extern struct platform_device mxc_fec_device;
+extern struct platform_device mxc_pwm_device;