summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHeiko Schocher <[email protected]>2011-11-01 20:00:25 +0000
committerAlbert ARIBAUD <[email protected]>2011-11-03 22:56:24 +0100
commit4ebe208097a374348689907680e002be3ee9e91c (patch)
tree4e01d7d56db04fd4bf9dcccae13be9211d554944 /drivers
parentedc633ea7707fef933e4ce6b380c15c16572d607 (diff)
usb, davinci: add enable_vbus() weak function
Signed-off-by: Heiko Schocher <[email protected]> Cc: Remy Bohmer <[email protected]> Cc: Albert ARIBAUD <[email protected]> Cc: Igor Grinberg <[email protected]> Signed-off-by: Sandeep Paulraj <[email protected]>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/musb/davinci.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index f56f2df532e..c94a7623ff8 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;