From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Wed, 2 Nov 2011 07:00:25 +0100 Subject: [U-Boot] [PATCH v6 01/11] usb, davinci: add enable_vbus() weak function In-Reply-To: <1320213635-8056-1-git-send-email-hs@denx.de> References: <1320213635-8056-1-git-send-email-hs@denx.de> Message-ID: <1320213635-8056-2-git-send-email-hs@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Signed-off-by: Heiko Schocher Cc: Remy Bohmer Cc: Albert ARIBAUD Cc: Igor Grinberg --- 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