summary refs log tree commit diff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorHema HK <hemahk@ti.com>2011-02-28 14:19:35 +0530
committerFelipe Balbi <balbi@ti.com>2011-05-18 13:39:44 +0300
commit1f15848807c20762017da29fa1dac64fb67b8128 (patch)
treebcc867dac9dccebf54304a77dc1e2a4a75bef142 /arch/arm/mach-omap2
parent693d92a1bbc9e42681c42ed190bd42b636ca876f (diff)
downloadlinux-1f15848807c20762017da29fa1dac64fb67b8128.tar.gz
usb: musb: OMAP4430: Power down the PHY during board init
Powerdown the internal PHY during board init for OMAP44xx.
So that when musb is disabled core transition to retention/off
is not blocked.

Signed-off-by: Hema HK <hemahk@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/usb-musb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 35559f77e2de..f665adeec3f0 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -117,11 +117,6 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
 	int				bus_id = -1;
 	const char			*oh_name, *name;
 
-	if (cpu_is_omap3517() || cpu_is_omap3505()) {
-	} else if (cpu_is_omap44xx()) {
-		usb_musb_mux_init(board_data);
-	}
-
 	/*
 	 * REVISIT: This line can be removed once all the platforms using
 	 * musb_core.c have been converted to use use clkdev.
@@ -164,6 +159,9 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
 	dev->dma_mask = &musb_dmamask;
 	dev->coherent_dma_mask = musb_dmamask;
 	put_device(dev);
+
+	if (cpu_is_omap44xx())
+		omap4430_phy_init(dev);
 }
 
 #else