public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Dan Murphy <dmurphy@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 3/7] ARM: OMAP: USB: Fix linker error when ULPI is not defined
Date: Thu, 1 Aug 2013 14:05:58 -0500	[thread overview]
Message-ID: <1375383962-10160-4-git-send-email-dmurphy@ti.com> (raw)
In-Reply-To: <1375383962-10160-1-git-send-email-dmurphy@ti.com>

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>
---

v3 - No updates - http://patchwork.ozlabs.org/patch/258228/
v4 - No updates - http://patchwork.ozlabs.org/patch/259755/

 drivers/usb/host/ehci-omap.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 1ab8edc..7dc4ff6 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -76,6 +76,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;
@@ -85,6 +86,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)
 {
-- 
1.7.9.5

  parent reply	other threads:[~2013-08-01 19:05 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-01 19:05 [U-Boot] OMAP5 uEVM USB eHCI patch set v4 Dan Murphy
2013-08-01 19:05 ` [U-Boot] [PATCH v4 1/7] omap5: uevm: Change the board name to correct name Dan Murphy
2013-08-01 19:05 ` [U-Boot] [PATCH v4 2/7] ARM: OMAP5: USB: Add OMAP5 common USB EHCI information Dan Murphy
2013-08-01 19:05 ` Dan Murphy [this message]
2013-08-01 19:05 ` [U-Boot] [PATCH v4 4/7] ARM: OMAP5-uevm: Add USB ehci support for the uEVM Dan Murphy
2013-08-01 19:06 ` [U-Boot] [PATCH v4 5/7] ARM: OMAP5-uevm: Add USB MAC ethernet address Dan Murphy
2013-08-01 19:06 ` [U-Boot] [PATCH v4 6/7] USB: usb-hub: Add a weak function for resetting devices Dan Murphy
2013-08-01 19:06 ` [U-Boot] [PATCH v4 7/7] ARM: OMAP5-uevm: Add usb device reset API Dan Murphy
2013-08-01 19:35 ` [U-Boot] OMAP5 uEVM USB eHCI patch set v4 Marek Vasut

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375383962-10160-4-git-send-email-dmurphy@ti.com \
    --to=dmurphy@ti.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox