diff options
author | Vikram Pandita <vikram.pandita@ti.com> | 2009-07-17 20:33:09 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-10-05 13:51:00 -0400 |
commit | 71a807757394205cdb1465d68a4f0be50fd6f04b (patch) | |
tree | ed71b75cb126d30b077c3b937347f5a363ae639b /arch/arm | |
parent | 8cb0ac999f253212bb01cd3c0d686489ec5911ad (diff) |
OMAP3: PM: USBHOST: clear wakeup events on both hosts
USBHOST module has 2 fclocks (for HOST1 and HOST2), only one iclock
and only a single bit in the WKST register to indicate a wakeup event.
Because of the single WKST bit, we cannot know whether a wakeup event
was on HOST1 or HOST2, so enable both fclocks before clearing the
wakeup event to ensure both hosts can properly clear the event.
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index d9440a18bd00..cf6ea9f318fb 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -63,7 +63,7 @@ static struct powerdomain *mpu_pwrdm; | |||
63 | */ | 63 | */ |
64 | static int prcm_clear_mod_irqs(s16 module, u8 regs) | 64 | static int prcm_clear_mod_irqs(s16 module, u8 regs) |
65 | { | 65 | { |
66 | u32 wkst, fclk, iclk; | 66 | u32 wkst, fclk, iclk, clken; |
67 | u16 wkst_off = (regs == 3) ? OMAP3430ES2_PM_WKST3 : PM_WKST1; | 67 | u16 wkst_off = (regs == 3) ? OMAP3430ES2_PM_WKST3 : PM_WKST1; |
68 | u16 fclk_off = (regs == 3) ? OMAP3430ES2_CM_FCLKEN3 : CM_FCLKEN1; | 68 | u16 fclk_off = (regs == 3) ? OMAP3430ES2_CM_FCLKEN3 : CM_FCLKEN1; |
69 | u16 iclk_off = (regs == 3) ? CM_ICLKEN3 : CM_ICLKEN1; | 69 | u16 iclk_off = (regs == 3) ? CM_ICLKEN3 : CM_ICLKEN1; |
@@ -77,8 +77,15 @@ static int prcm_clear_mod_irqs(s16 module, u8 regs) | |||
77 | iclk = cm_read_mod_reg(module, iclk_off); | 77 | iclk = cm_read_mod_reg(module, iclk_off); |
78 | fclk = cm_read_mod_reg(module, fclk_off); | 78 | fclk = cm_read_mod_reg(module, fclk_off); |
79 | while (wkst) { | 79 | while (wkst) { |
80 | cm_set_mod_reg_bits(wkst, module, iclk_off); | 80 | clken = wkst; |
81 | cm_set_mod_reg_bits(wkst, module, fclk_off); | 81 | cm_set_mod_reg_bits(clken, module, iclk_off); |
82 | /* | ||
83 | * For USBHOST, we don't know whether HOST1 or | ||
84 | * HOST2 woke us up, so enable both f-clocks | ||
85 | */ | ||
86 | if (module == OMAP3430ES2_USBHOST_MOD) | ||
87 | clken |= 1 << OMAP3430ES2_EN_USBHOST2_SHIFT; | ||
88 | cm_set_mod_reg_bits(clken, module, fclk_off); | ||
82 | prm_write_mod_reg(wkst, module, wkst_off); | 89 | prm_write_mod_reg(wkst, module, wkst_off); |
83 | wkst = prm_read_mod_reg(module, wkst_off); | 90 | wkst = prm_read_mod_reg(module, wkst_off); |
84 | c++; | 91 | c++; |