diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-17 08:45:49 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-17 08:45:49 +0100 |
commit | 40bd757243edfeb915e73d0a159e35c14256cc25 (patch) | |
tree | 697e65fc4ed22a1986a7888372adf6c8ecdbc0b0 /arch/arm/mach-imx/include/mach/devices-imx31.h | |
parent | b44e775eda587fc863ba9cbb9419b734d623f44c (diff) | |
parent | 752e56babfbc4c9435592f4ee699dc48ed525a76 (diff) | |
download | barebox-40bd757243edfeb915e73d0a159e35c14256cc25.tar.gz barebox-40bd757243edfeb915e73d0a159e35c14256cc25.tar.xz |
Merge branch 'pu/usb' into for-next/imx
Conflicts:
arch/arm/mach-imx/include/mach/devices-imx31.h
Diffstat (limited to 'arch/arm/mach-imx/include/mach/devices-imx31.h')
-rw-r--r-- | arch/arm/mach-imx/include/mach/devices-imx31.h | 15 |
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); +} |