Merge branch 'pu/usb' into for-next/imx

Conflicts:
	arch/arm/mach-imx/include/mach/devices-imx31.h

1 files changed, 15 insertions, 0 deletions

diff --git a/arch/arm/mach-imx/include/mach/devices-imx31.h b/arch/arm/mach-imx/include/mach/devices-imx31.h
index 5a24100dfd..7cf9114fbd 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx31.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx31.h
@@ -61,3 +61,18 @@ static inline struct device_d *imx31_add_mmc1(void *pdata)
 {
 	return imx_add_mmc((void *)MX31_SDHC2_BASE_ADDR, 1, pdata);
 }
+
+static inline struct device_d *imx31_add_usbotg(void *pdata)
+{
+	return imx_add_usb((void *)MX31_USB_OTG_BASE_ADDR, 0, pdata);
+}
+
+static inline struct device_d *imx31_add_usbh1(void *pdata)
+{
+	return imx_add_usb((void *)MX31_USB_OTG_BASE_ADDR + 0x200, 1, pdata);
+}
+
+static inline struct device_d *imx31_add_usbh2(void *pdata)
+{
+	return imx_add_usb((void *)MX31_USB_OTG_BASE_ADDR + 0x400, 2, pdata);
+}