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>

3 files changed, 25 insertions, 33 deletions

diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 6b724c2ed0a7..759299bb035b 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -209,7 +209,6 @@ static struct platform_device serial_device = {
 };
 #endif
 
-#if defined(CONFIG_USB_ULPI)
 static int eukrea_cpuimx27_otg_init(struct platform_device *pdev)
 {
         return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);
@@ -229,7 +228,6 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = {
         .init   = eukrea_cpuimx27_usbh2_init,
         .portsc = MXC_EHCI_MODE_ULPI,
 };
-#endif
 
 static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
         .operating_mode = FSL_USB2_DR_DEVICE,
@@ -283,21 +281,19 @@ static void __init eukrea_cpuimx27_init(void)
         platform_device_register(&serial_device);
 #endif
 
-#if defined(CONFIG_USB_ULPI)
         if (otg_mode_host) {
-                otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
-
-                imx27_add_mxc_ehci_otg(&otg_pdata);
+                otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
+                                ULPI_OTG_DRVVBUS_EXT);
+                if (otg_pdata.otg)
+                        imx27_add_mxc_ehci_otg(&otg_pdata);
+        } else {
+                imx27_add_fsl_usb2_udc(&otg_device_pdata);
         }
 
-        usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
-
-        imx27_add_mxc_ehci_hs(2, &usbh2_pdata);
-#endif
-        if (!otg_mode_host)
-                imx27_add_fsl_usb2_udc(&otg_device_pdata);
+        usbh2_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
+                        ULPI_OTG_DRVVBUS_EXT);
+        if (usbh2_pdata.otg)
+                imx27_add_mxc_ehci_hs(2, &usbh2_pdata);
 
 #ifdef CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD
         eukrea_mbimx27_baseboard_init();
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index f4f2725b6945..614b3c00c4a0 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -162,7 +162,6 @@ static int otg_phy_init(void)
         return 0;
 }
 
-#if defined(CONFIG_USB_ULPI)
 static int mx27_3ds_otg_init(struct platform_device *pdev)
 {
         return mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);
@@ -172,7 +171,6 @@ static struct mxc_usbh_platform_data otg_pdata __initdata = {
         .init   = mx27_3ds_otg_init,
         .portsc = MXC_EHCI_MODE_ULPI,
 };
-#endif
 
 static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
         .operating_mode = FSL_USB2_DR_DEVICE,
@@ -275,14 +273,15 @@ static void __init mx27pdk_init(void)
         imx27_add_mxc_mmc(0, &sdhc1_pdata);
         imx27_add_imx2_wdt(NULL);
         otg_phy_init();
-#if defined(CONFIG_USB_ULPI)
+
         if (otg_mode_host) {
-                otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
+                otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
+                                ULPI_OTG_DRVVBUS_EXT);
 
-                imx27_add_mxc_ehci_otg(&otg_pdata);
+                if (otg_pdata.otg)
+                        imx27_add_mxc_ehci_otg(&otg_pdata);
         }
-#endif
+
         if (!otg_mode_host)
                 imx27_add_fsl_usb2_udc(&otg_device_pdata);
 
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index f754bab040b6..63e182556778 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -267,7 +267,6 @@ static const struct imxmmc_platform_data sdhc_pdata __initconst = {
         .exit = pca100_sdhc2_exit,
 };
 
-#if defined(CONFIG_USB_ULPI)
 static int otg_phy_init(struct platform_device *pdev)
 {
         gpio_set_value(OTG_PHY_CS_GPIO, 0);
@@ -295,7 +294,6 @@ static struct mxc_usbh_platform_data usbh2_pdata __initdata = {
         .init   = usbh2_phy_init,
         .portsc = MXC_EHCI_MODE_ULPI,
 };
-#endif
 
 static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
         .operating_mode = FSL_USB2_DR_DEVICE,
@@ -402,23 +400,22 @@ static void __init pca100_init(void)
         gpio_request(USBH2_PHY_CS_GPIO, "usb-host2-cs");
         gpio_direction_output(USBH2_PHY_CS_GPIO, 1);
 
-#if defined(CONFIG_USB_ULPI)
         if (otg_mode_host) {
-                otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
+                otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
+                                ULPI_OTG_DRVVBUS_EXT);
 
-                imx27_add_mxc_ehci_otg(&otg_pdata);
+                if (otg_pdata.otg)
+                        imx27_add_mxc_ehci_otg(&otg_pdata);
+        } else {
+                gpio_set_value(OTG_PHY_CS_GPIO, 0);
+                imx27_add_fsl_usb2_udc(&otg_device_pdata);
         }
 
         usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
                                 ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
-        imx27_add_mxc_ehci_hs(2, &usbh2_pdata);
-#endif
-        if (!otg_mode_host) {
-                gpio_set_value(OTG_PHY_CS_GPIO, 0);
-                imx27_add_fsl_usb2_udc(&otg_device_pdata);
-        }
+        if (usbh2_pdata.otg)
+                imx27_add_mxc_ehci_hs(2, &usbh2_pdata);
 
         imx27_add_imx_fb(&pca100_fb_data);