Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

OMAP3: PM: Ensure MUSB block can idle when driver not loaded

Browse Source 
Otherwise, bootloaders may leave MUSB in a state which prevents
retention.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
This commit is contained in:
Peter 'p2' De Schrijver 2009-01-19 19:09:22 +02:00 committed by Kevin Hilman
parent 01cbd4d115
commit 94a3ef6f28
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/Makefile
View File

@ -57,6 +57,4 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
mmc-twl4030.o mmc-twl4030.o
# Platform specific device init code # Platform specific device init code
ifeq ($(CONFIG_USB_MUSB_SOC),y)
obj-y += usb-musb.o obj-y += usb-musb.o
endif

20
arch/arm/mach-omap2/usb-musb.c
View File

@ -31,6 +31,17 @@
#include <mach/mux.h> #include <mach/mux.h>
#include <mach/usb.h> #include <mach/usb.h>
#define OTG_SYSCONFIG (OMAP34XX_HSUSB_OTG_BASE + 0x404)
static void __init usb_musb_pm_init(void)
{
/* Ensure force-idle mode for OTG controller */
if (cpu_is_omap34xx())
omap_writel(0, OTG_SYSCONFIG);
}
#ifdef CONFIG_USB_MUSB_SOC
static struct resource musb_resources[] = { static struct resource musb_resources[] = {
[0] = { /* start and end set dynamically */ [0] = { /* start and end set dynamically */
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
@ -183,4 +194,13 @@ void __init usb_musb_init(void)
printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n"); printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
return; return;
} }
usb_musb_pm_init();
} }
#else
void __init usb_musb_init(void)
{
usb_musb_pm_init();
}
#endif /* CONFIG_USB_MUSB_SOC */

6
arch/arm/plat-omap/include/mach/usb.h
View File

@ -27,13 +27,7 @@
#define UDC_BASE OMAP2_UDC_BASE #define UDC_BASE OMAP2_UDC_BASE
#define OMAP_OHCI_BASE OMAP2_OHCI_BASE #define OMAP_OHCI_BASE OMAP2_OHCI_BASE
#ifdef CONFIG_USB_MUSB_SOC
extern void usb_musb_init(void); extern void usb_musb_init(void);
#else
static inline void usb_musb_init(void)
{
}
#endif
#endif #endif