summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5/mx51_efika.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-03-02 09:27:42 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-07 19:29:41 +0100
commit48f6b0999673cce33e4a54d89c78460cc28e5156 (patch)
tree1ada2b337a7af540246968a9150b0c0a8ebabc3c /arch/arm/mach-mx5/mx51_efika.c
parent94573e6623cf9159f036adc670a3d4b29e6d86fe (diff)
downloadblackbird-op-linux-48f6b0999673cce33e4a54d89c78460cc28e5156.tar.gz
blackbird-op-linux-48f6b0999673cce33e4a54d89c78460cc28e5156.zip
ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers
The boards are currently using otg_ulpi_create and mxc_ulpi_access_ops, both are only present if CONFIG_USB_ULPI is set. To remove the need of ifdefs in the board code introduce a imx_otg_ulpi_create functions which expands to a static inline function if compiled without ulpi. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx5/mx51_efika.c')
-rw-r--r--arch/arm/mach-mx5/mx51_efika.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index 74991c913bf6..51a67fc7f0ef 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -218,12 +218,12 @@ static void __init mx51_efika_usb(void)
msleep(1);
gpio_set_value(EFIKA_USB_PHY_RESET, 1);
- usbh1_config.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
- ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT |
- ULPI_OTG_EXTVBUSIND);
+ usbh1_config.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
+ ULPI_OTG_DRVVBUS_EXT | ULPI_OTG_EXTVBUSIND);
mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config);
- mxc_register_device(&mxc_usbh1_device, &usbh1_config);
+ if (usbh1_config.otg)
+ mxc_register_device(&mxc_usbh1_device, &usbh1_config);
}
static struct mtd_partition mx51_efika_spi_nor_partitions[] = {
OpenPOWER on IntegriCloud