2 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 242d8f925e9e..6789dd4029a1 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;
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 3358c0d47b1a..cf78e6c5a277 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -61,7 +61,7 @@ static void __init omap2_gp_timer_init(void)
         u32 tick_period;
 
         omap_dm_timer_init();
-        gptimer = omap_dm_timer_request_specific(2);
+        gptimer = omap_dm_timer_request_specific(1);
         BUG_ON(gptimer == NULL);
 
         omap_dm_timer_set_source(gptimer, OMAP_TIMER_SRC_SYS_CLK);