aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-03-02 03:27:42 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-07 13:29:41 -0500
commit48f6b0999673cce33e4a54d89c78460cc28e5156 (patch)
tree1ada2b337a7af540246968a9150b0c0a8ebabc3c /arch/arm/mach-mx5
parent94573e6623cf9159f036adc670a3d4b29e6d86fe (diff)
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')
-rw-r--r--arch/arm/mach-mx5/board-mx51_efikasb.c8
-rw-r--r--arch/arm/mach-mx5/mx51_efika.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
index 18e29b9b088b..db04ce8462dc 100644
--- a/arch/arm/mach-mx5/board-mx51_efikasb.c
+++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
@@ -129,10 +129,10 @@ static struct mxc_usbh_platform_data usbh2_config = {
129 129
130static void __init mx51_efikasb_usb(void) 130static void __init mx51_efikasb_usb(void)
131{ 131{
132 usbh2_config.otg = otg_ulpi_create(&mxc_ulpi_access_ops, 132 usbh2_config.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
133 ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT | 133 ULPI_OTG_DRVVBUS_EXT | ULPI_OTG_EXTVBUSIND);
134 ULPI_OTG_EXTVBUSIND); 134 if (usbh2_config.otg)
135 mxc_register_device(&mxc_usbh2_device, &usbh2_config); 135 mxc_register_device(&mxc_usbh2_device, &usbh2_config);
136} 136}
137 137
138static struct gpio_led mx51_efikasb_leds[] = { 138static struct gpio_led mx51_efikasb_leds[] = {
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)
218 msleep(1); 218 msleep(1);
219 gpio_set_value(EFIKA_USB_PHY_RESET, 1); 219 gpio_set_value(EFIKA_USB_PHY_RESET, 1);
220 220
221 usbh1_config.otg = otg_ulpi_create(&mxc_ulpi_access_ops, 221 usbh1_config.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
222 ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT | 222 ULPI_OTG_DRVVBUS_EXT | ULPI_OTG_EXTVBUSIND);
223 ULPI_OTG_EXTVBUSIND);
224 223
225 mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config); 224 mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config);
226 mxc_register_device(&mxc_usbh1_device, &usbh1_config); 225 if (usbh1_config.otg)
226 mxc_register_device(&mxc_usbh1_device, &usbh1_config);
227} 227}
228 228
229static struct mtd_partition mx51_efika_spi_nor_partitions[] = { 229static struct mtd_partition mx51_efika_spi_nor_partitions[] = {