OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
PATCH 1/1 OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
Checking to se if the IO daisy chain is enabled should be checking the PM_WKEN register, not the PM_WKST register. Reading PM_WKST tells us if an event occurred, not whether or not it is enabled.
Apparently, we've been lucky until now in that a pending event has not been there during enable. However, on 3630/Zoom3, I noticed because of the WARN that this timeout was always happening.
---
Applies to mainline v2.6.35-rc1, also in my pm-fixes branch.
arch/arm/mach-omap2/pm34xx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/pm34xx.c +2 -2
@@ -99,7 +99,7 @@ static void omap3_enable_io_chain(void)/* Do a readback to assure write has been done */ prm_read_mod_reg (WKUP_MOD ,PM_WKEN ); -while (!(prm_read_mod_reg (WKUP_MOD ,PM_WKST ) & +while (!(prm_read_mod_reg (WKUP_MOD ,PM_WKEN ) &OMAP3430_ST_IO_CHAIN_MASK )) { timeout++;if (timeout >1000 ) {
@@ -108,7 +108,7 @@ static void omap3_enable_io_chain(void)return ; }prm_set_mod_reg_bits (OMAP3430_ST_IO_CHAIN_MASK , -WKUP_MOD ,PM_WKST ); +WKUP_MOD ,PM_WKEN ); } } }
Signature · 1 line
1.7.0.2
Tony Lindgren
maintainerPATCH 1/1 OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: omap-fixes
Initial commit ID (Likely to change): 4f4348dafd232a570641266e326c044abe5709fe
PatchWorks
http://patchwork.kernel.org/patch/104143/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=4f4348dafd232a570641266e326c044abe5709fe