From: Dan Murphy <dmurphy@ti.com>
Date: Thu, 1 Aug 2013 19:05:58 +0000 (-0500)
Subject: ARM: OMAP: USB: Fix linker error when ULPI is not defined
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=120503f32e1dcad3069633d6319d5d6c37e65c08;p=project%2Fbcm63xx%2Fu-boot.git

ARM: OMAP: USB: Fix linker error when ULPI is not defined

Fix the linker error for missing ulpi_reset when ulpi is not defined
in the board config.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Marek Vasut <marex@denx.de>
---

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index ec24fe05a3..3c58f9e656 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -79,6 +79,7 @@ static void omap_usbhs_hsic_init(int port)
 	writel(reg, &usbtll->channel_conf + port);
 }
 
+#ifdef CONFIG_USB_ULPI
 static void omap_ehci_soft_phy_reset(int port)
 {
 	struct ulpi_viewport ulpi_vp;
@@ -88,6 +89,12 @@ static void omap_ehci_soft_phy_reset(int port)
 
 	ulpi_reset(&ulpi_vp);
 }
+#else
+static void omap_ehci_soft_phy_reset(int port)
+{
+	return;
+}
+#endif
 
 inline int __board_usb_init(void)
 {