From: Dan Murphy <dmurphy@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [[PATCH v2 4/6] ARM: OMAP: USB: Fix linker error when ULPI is not defined
Date: Wed, 10 Jul 2013 15:05:07 -0500 [thread overview]
Message-ID: <1373486709-13015-5-git-send-email-dmurphy@ti.com> (raw)
In-Reply-To: <1373486709-13015-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>
---
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 17f2214..bd7191c 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -90,6 +90,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;
@@ -99,6 +100,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
next prev parent reply other threads:[~2013-07-10 20:05 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-10 20:05 [U-Boot] OMAP5 USB EHCI Dan Murphy
2013-07-10 20:05 ` [U-Boot] [[PATCH v2 1/6] omap5: uevm: Change the board name to correct name Dan Murphy
2013-07-10 23:48 ` Nishanth Menon
2013-07-10 20:05 ` [U-Boot] [[PATCH v2 2/6] ARM: OMAP5: Power: Add USB LDO9 enable interface Dan Murphy
2013-07-11 7:56 ` Roger Quadros
2013-07-11 13:44 ` Dan Murphy
2013-07-10 20:05 ` [U-Boot] [[PATCH v2 3/6] ARM: OMAP5: USB: Add OMAP5 common USB EHCI information Dan Murphy
2013-07-11 3:51 ` Lokesh Vutla
2013-07-11 7:58 ` Roger Quadros
2013-07-11 8:35 ` Sricharan R
2013-07-11 8:55 ` Roger Quadros
2013-07-11 9:31 ` Sricharan R
2013-07-11 13:48 ` Dan Murphy
2013-07-11 14:37 ` Tom Rini
2013-07-10 20:05 ` Dan Murphy [this message]
2013-07-10 20:05 ` [U-Boot] [[PATCH v2 5/6] USB: ehci: Add a weak function for resetting devices Dan Murphy
2013-07-10 22:20 ` Marek Vasut
2013-07-10 23:16 ` Dan Murphy
2013-07-11 8:11 ` Roger Quadros
2013-07-11 12:35 ` Marek Vasut
2013-07-11 14:23 ` Roger Quadros
2013-07-11 15:29 ` Dan Murphy
2013-07-15 3:19 ` Marek Vasut
2013-07-16 20:19 ` Dan Murphy
2013-07-11 16:06 ` Marek Vasut
2013-07-10 20:05 ` [U-Boot] [[PATCH v2 6/6] ARM: OMAP5-uevm: Add USB ehci support for the uEVM Dan Murphy
2013-07-11 14:46 ` Tom Rini
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=1373486709-13015-5-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