From: Heiko Schocher <hs@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v6 01/11] usb, davinci: add enable_vbus() weak function
Date: Wed, 2 Nov 2011 07:00:25 +0100 [thread overview]
Message-ID: <1320213635-8056-2-git-send-email-hs@denx.de> (raw)
In-Reply-To: <1320213635-8056-1-git-send-email-hs@denx.de>
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Remy Bohmer <linux@bohmer.net>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
Cc: Igor Grinberg <grinberg@compulab.co.il>
---
changes for v4:
- patch is new since v4, as Igor Grinberg suggested.
changes for v6:
- make enable_vbus() weak with alias
drivers/usb/musb/davinci.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index f56f2df..c94a762 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -78,6 +78,17 @@ static void phy_off(void)
writel(USBPHY_OSCPDWN | USBPHY_PHYPDWN, USBPHY_CTL_PADDR);
}
+void __enable_vbus(void)
+{
+ /*
+ * nothing to do, vbus is handled through the cpu.
+ * Define this function in board code, if it is
+ * different on your board.
+ */
+}
+void enable_vbus(void)
+ __attribute__((weak, alias("__enable_vbus")));
+
/*
* This function performs Davinci platform specific initialization for usb0.
*/
@@ -86,9 +97,8 @@ int musb_platform_init(void)
u32 revision;
/* enable USB VBUS */
-#ifndef DAVINCI_DM365EVM
enable_vbus();
-#endif
+
/* start the on-chip USB phy and its pll */
if (!phy_on())
return -1;
--
1.7.6.4
next prev parent reply other threads:[~2011-11-02 6:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-02 6:00 [U-Boot] [PATCH v6 00/11] arm, davinci: add support for dm368 based cam_enc_4xx board Heiko Schocher
2011-11-02 6:00 ` Heiko Schocher [this message]
2011-11-02 6:00 ` [U-Boot] [PATCH v6 02/11] arm, usb, davinci: make USBPHY_CTL register configurable Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 03/11] net, davinci_emac: make clock divider in MDIO control " Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 04/11] spl: add option for adding post memory test to the SPL framework Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 05/11] arm, davinci: add support for new spl framework Heiko Schocher
2011-11-02 22:53 ` Scott Wood
2011-11-03 5:31 ` [U-Boot] [PATCH v7 " Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 06/11] spl, nand: add 4bit HW ecc oob first nand_read_page function Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 07/11] arm, davinci: add header files for dm365 Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 08/11] arm, davinci: add lowlevel function for dm365 soc Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 09/11] arm926ejs, davinci: add cpuinfo for dm365 Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 10/11] arm926ejs, davinci: add missing spi defines " Heiko Schocher
2011-11-02 6:00 ` [U-Boot] [PATCH v6 11/11] arm, davinci: add cam_enc_4xx support Heiko Schocher
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=1320213635-8056-2-git-send-email-hs@denx.de \
--to=hs@denx.de \
--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