diff options
author | Tero Kristo <t-kristo@ti.com> | 2012-11-09 09:30:35 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@ti.com> | 2012-11-13 18:57:09 -0500 |
commit | 4fd7a41233eac62b10ede394b35d8919086f94ec (patch) | |
tree | 39b16f2baa69cad668df2c6511f2ec1515df1f3f /arch/arm/mach-omap2/omap_phy_internal.c | |
parent | 0c7018e232c5526869250e57da8043a86a45b5de (diff) |
ARM: OMAP4: USB: power down MUSB PHY during boot
Commit c9e4412ab8eb8ef82d645d8749c4ce96ad490007 removed all of the USB
PHY functions for OMAP4, but this causes a problem with core retention
as the MUSB module remains enabled if omap-usb2 phy driver is not used.
This keeps the USB DPLL enabled and prevents l3_init pwrdm from idling.
Fixed by adding a minimal function back that disables the USB PHY during
boot.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_phy_internal.c')
-rw-r--r-- | arch/arm/mach-omap2/omap_phy_internal.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index d992db8ff0b0..9b56e5e1a2d2 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c | |||
@@ -33,6 +33,38 @@ | |||
33 | #include "soc.h" | 33 | #include "soc.h" |
34 | #include "control.h" | 34 | #include "control.h" |
35 | 35 | ||
36 | #define CONTROL_DEV_CONF 0x300 | ||
37 | #define PHY_PD 0x1 | ||
38 | |||
39 | /** | ||
40 | * omap4430_phy_power_down: disable MUSB PHY during early init | ||
41 | * | ||
42 | * OMAP4 MUSB PHY module is enabled by default on reset, but this will | ||
43 | * prevent core retention if not disabled by SW. USB driver will | ||
44 | * later on enable this, once and if the driver needs it. | ||
45 | */ | ||
46 | static int __init omap4430_phy_power_down(void) | ||
47 | { | ||
48 | void __iomem *ctrl_base; | ||
49 | |||
50 | if (!cpu_is_omap44xx()) | ||
51 | return 0; | ||
52 | |||
53 | ctrl_base = ioremap(OMAP443X_SCM_BASE, SZ_1K); | ||
54 | if (!ctrl_base) { | ||
55 | pr_err("control module ioremap failed\n"); | ||
56 | return -ENOMEM; | ||
57 | } | ||
58 | |||
59 | /* Power down the phy */ | ||
60 | __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF); | ||
61 | |||
62 | iounmap(ctrl_base); | ||
63 | |||
64 | return 0; | ||
65 | } | ||
66 | early_initcall(omap4430_phy_power_down); | ||
67 | |||
36 | void am35x_musb_reset(void) | 68 | void am35x_musb_reset(void) |
37 | { | 69 | { |
38 | u32 regval; | 70 | u32 regval; |