From: Tony Lindgren <tony@atomide.com>
Date: Wed, 3 Apr 2013 17:47:59 +0000 (-0700)
Subject: Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap... 
X-Git-Tag: v3.10-rc1~102^2~20^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f585bbfc54fec9dcf387fd2edb2d6f4908badf8;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'omap-timer-for-v3.10' of git://github.com/jonhunter/linux into omap-for-v3.10/timer

Conflicts:
	arch/arm/mach-omap2/timer.c
---

7f585bbfc54fec9dcf387fd2edb2d6f4908badf8
diff --cc arch/arm/mach-omap2/board-generic.c
index e54a480,7324d99..78813b3
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -140,9 -139,8 +140,9 @@@ DT_MACHINE_START(AM33XX_DT, "Generic AM
  	.init_irq	= omap_intc_of_init,
  	.handle_irq	= omap3_intc_handle_irq,
  	.init_machine	= omap_generic_init,
- 	.init_time	= omap3_am33xx_gptimer_timer_init,
+ 	.init_time	= omap3_gptimer_timer_init,
  	.dt_compat	= am33xx_boards_compat,
 +	.restart	= am33xx_restart,
  MACHINE_END
  #endif
  
diff --cc arch/arm/mach-omap2/timer.c
index 06cbb49,fd05024..858ec7c
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -130,8 -120,8 +120,7 @@@ static void omap2_gp_timer_set_mode(enu
  }
  
  static struct clock_event_device clockevent_gpt = {
- 	.name		= "gp_timer",
  	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
 -	.shift		= 32,
  	.rating		= 300,
  	.set_next_event	= omap2_gp_timer_set_next_event,
  	.set_mode	= omap2_gp_timer_set_mode,
@@@ -336,14 -336,20 +335,14 @@@ static void __init omap2_gp_clockevent_
  
  	__omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW);
  
 -	clockevent_gpt.mult = div_sc(clkev.rate, NSEC_PER_SEC,
 -				     clockevent_gpt.shift);
 -	clockevent_gpt.max_delta_ns =
 -		clockevent_delta2ns(0xffffffff, &clockevent_gpt);
 -	clockevent_gpt.min_delta_ns =
 -		clockevent_delta2ns(3, &clockevent_gpt);
 -		/* Timer internal resynch latency. */
 -
  	clockevent_gpt.cpumask = cpu_possible_mask;
  	clockevent_gpt.irq = omap_dm_timer_get_irq(&clkev);
 -	clockevents_register_device(&clockevent_gpt);
 +	clockevents_config_and_register(&clockevent_gpt, clkev.rate,
 +					3, /* Timer internal resynch latency */
 +					0xffffffff);
  
- 	pr_info("OMAP clockevent source: GPTIMER%d at %lu Hz\n",
- 		gptimer_id, clkev.rate);
+ 	pr_info("OMAP clockevent source: %s at %lu Hz\n", clockevent_gpt.name,
+ 		clkev.rate);
  }
  
  /* Clocksource code */
@@@ -488,7 -496,7 +489,7 @@@ static void __init realtime_counter_ini
  		pr_err("%s: ioremap failed\n", __func__);
  		return;
  	}
- 	sys_clk = clk_get(NULL, OMAP5_MPU_SOURCE);
 -	sys_clk = clk_get(NULL, "sys_clkin_ck");
++	sys_clk = clk_get(NULL, "sys_clkin");
  	if (IS_ERR(sys_clk)) {
  		pr_err("%s: failed to get system clock handle\n", __func__);
  		iounmap(base);