All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dan Murphy <dmurphy@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/6] usb: omap5: Change the board_usb_init api to board_xhci_usb_init
Date: Wed, 9 Oct 2013 12:19:27 -0500	[thread overview]
Message-ID: <1381339171-31647-3-git-send-email-dmurphy@ti.com> (raw)
In-Reply-To: <1381339171-31647-1-git-send-email-dmurphy@ti.com>

Recent patches declares board_usb_init function prototype for a new
usb architecture.

Turning on the OMAP_XHCI defines cause a redefinition compiler failure.
So rename the API from board_usb_init to board_xhci_usb_init.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 board/ti/omap5_uevm/evm.c    |    4 ++--
 drivers/usb/host/xhci-omap.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 228df29..e85afdc 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -214,12 +214,12 @@ void usb_hub_reset_devices(int port)
 
 #ifdef CONFIG_USB_XHCI_OMAP
 /**
- * @brief board_usb_init - Configure EVM board specific configurations
+ * @brief board_xhci_host_init - Configure EVM board specific configurations
  * for the LDO's and clocks for the USB blocks.
  *
  * @return 0
  */
-int board_usb_init(void)
+int board_xhci_host_init(void)
 {
 	int ret;
 #ifdef CONFIG_PALMAS_USB_SS_PWR
diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
index a8702da..0093e63 100644
--- a/drivers/usb/host/xhci-omap.c
+++ b/drivers/usb/host/xhci-omap.c
@@ -182,11 +182,11 @@ static void omap_enable_phy_clocks(struct omap_xhci *omap)
 
 };
 
-inline int __board_usb_init(void)
+inline int __board_xhci_host_init(void)
 {
 	return 0;
 }
-int board_usb_init(void) __attribute__((weak, alias("__board_usb_init")));
+int board_xhci_host_init(void) __attribute__((weak, alias("__board_xhci_host_init")));
 
 static void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode)
 {
@@ -295,7 +295,7 @@ int xhci_hcd_init(int index, struct xhci_hccr **hccr, struct xhci_hcor **hcor)
 	ctx->usb3_phy = (struct omap_usb3_phy *)OMAP_OCP1_SCP_BASE;
 	ctx->otg_wrapper = (struct omap_dwc_wrapper *)OMAP_OTG_WRAPPER_BASE;
 
-	ret = board_usb_init();
+	ret = board_xhci_host_init();
 	if (ret != 0) {
 		puts("Failed to initialize board for USB\n");
 		return ret;
-- 
1.7.9.5

  parent reply	other threads:[~2013-10-09 17:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-09 17:19 [U-Boot] TI xHCI updates Dan Murphy
2013-10-09 17:19 ` [U-Boot] [PATCH 1/6] usb: omap: Move the xhci-omap header file to common location Dan Murphy
2013-10-09 23:37   ` Marek Vasut
2013-10-10  0:22     ` Dan Murphy
2013-10-10  0:34       ` Marek Vasut
2013-10-09 17:19 ` Dan Murphy [this message]
2013-10-09 23:38   ` [U-Boot] [PATCH 2/6] usb: omap5: Change the board_usb_init api to board_xhci_usb_init Marek Vasut
2013-10-10  0:26     ` Dan Murphy
2013-10-09 17:19 ` [U-Boot] [PATCH 3/6] usb: omap: Move the usb phy code to the usb/phy directory Dan Murphy
2013-10-09 23:38   ` Marek Vasut
2013-10-10  0:21     ` Dan Murphy
2013-10-10  0:35       ` Marek Vasut
2013-10-10  0:36         ` Dan Murphy
2013-10-09 17:19 ` [U-Boot] [PATCH 4/6] usb: dra7xx: Add support for dra7xx xhci USB host Dan Murphy
2013-10-09 17:19 ` [U-Boot] [PATCH 5/6] usb: am437x: Add support for am437x " Dan Murphy
2013-10-10  0:33   ` Marek Vasut
2013-10-09 17:19 ` [U-Boot] [PATCH 6/6] ARM: omap5-evm: Move MAC creation to misc_init Dan Murphy
2013-10-09 17:21 ` [U-Boot] TI xHCI updates Dan Murphy
2013-10-09 17:26   ` Jagan Teki
2013-10-10  0:27     ` Dan Murphy
2013-10-10  0:34     ` 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=1381339171-31647-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.