aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authordushyanth.sr <dushyanth.sr@stericsson.com>2011-02-18 16:42:42 +0530
committerSrinidhi KASAGAR <srinidhi.kasagar@stericsson.com>2011-02-21 08:39:26 +0100
commitbb18d8f9da96085cd402bbfedad6f9cff64cf2bf (patch)
treefa691e0f56f819437639a2a00bcfd36b78c33761 /drivers/usb
parent51e3bd5f0ed72957c6c043f29b07e0aa948b3939 (diff)
ux500: musb: Remove usage of stm_gpio_altfuncenable/disable()
Removed usage of stm_gpio_altfuncenable/disable() in MUSB code. Initialisation of the GPIO's for USB has been moved to board specific file. ST-Ericsson ID: ER 276020 Signed-off-by: dushyanth.sr <dushyanth.sr@stericsson.com> Change-Id: I00f1c45e577af3b8c443789ec60aac24cccc02c0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/16409 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/stm_musb.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/musb/stm_musb.c b/drivers/usb/musb/stm_musb.c
index 4e812d8d81a..c851352a5ad 100644
--- a/drivers/usb/musb/stm_musb.c
+++ b/drivers/usb/musb/stm_musb.c
@@ -239,15 +239,9 @@ static u8 ulpi_write_register(struct musb *musb, u8 address, u8 data)
int __init musb_stm_hs_otg_init(struct musb *musb)
{
u8 val;
- int status;
if (musb->clock)
clk_enable(musb->clock);
- status = stm_gpio_altfuncenable(GPIO_ALT_USB_OTG);
- if (status) {
- DBG(1, "U8500 USB : Problem in enabling alternate function\n");
- return -EBUSY;
- }
/* enable ULPI interface */
val = musb_readb(musb->mregs, OTG_TOPCTRL);
@@ -508,13 +502,8 @@ done:
*/
int musb_platform_exit(struct musb *musb)
{
- int status = 0;
musb->clock = 0;
- status = stm_gpio_altfuncdisable(GPIO_ALT_USB_OTG);
- if (status) {
- DBG(1, "U8500 USB : Problem in disabling alternate function\n");
- return -EBUSY;
- }
+
if (musb->board_mode != MUSB_PERIPHERAL)
del_timer_sync(&notify_timer);