diff options
author | Timo Teras <timo.teras@solidboot.com> | 2006-06-26 23:16:13 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2006-06-26 23:16:13 (GMT) |
commit | e32f7ec2e8bf00756c74a5e6a80bc59e949dd81d (patch) | |
tree | 1b1e7d588c520ddad11c7ab036c4a50a5e92a49e /arch/arm/mach-omap2/clock.c | |
parent | 77900a2fc3bfb1eb6eaa6d43eef4591e1f7c600d (diff) | |
download | linux-fsl-qoriq-e32f7ec2e8bf00756c74a5e6a80bc59e949dd81d.tar.xz |
ARM: OMAP: Fix 32 kHz timer and modify GP timer to use GPT1
The dmtimer framework update broke 32 kHz timer as udelay() does not work
before system timer is started (and GPT1 should not be reset).
This also makes the GP timer use GPT1. This requires a fix in clock framework.
Signed-off-by: Timo Teras <timo.teras@solidboot.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
-rw-r--r-- | arch/arm/mach-omap2/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 242d8f9..6789dd4 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -753,7 +753,7 @@ static u32 omap2_get_src_field(u32 *type_to_addr, u32 reg_offset, val = 0x2; break; case CM_WKUP_SEL1: - src_reg_addr = (u32)&CM_CLKSEL2_CORE; + src_reg_addr = (u32)&CM_CLKSEL_WKUP; mask = 0x3; if (src_clk == &func_32k_ck) val = 0x0; |