From: Olof Johansson <olof@lixom.net>
Date: Wed, 17 Apr 2013 17:10:01 +0000 (-0700)
Subject: Merge tag 'clksrc-cleanup-for-3.10-part2' of git://sources.calxeda.com/kernel/linux... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=c3e0c873d0653e6e7628b5a8a9fcb3745444ca9e;p=linux-edison.git

Merge tag 'clksrc-cleanup-for-3.10-part2' of git://sources.calxeda.com/kernel/linux into late/clksrc

This is the 2nd part of ARM timer clean-ups for 3.10. This series has
the following changes:

- Add sched_clock selection logic to select the highest frequency clock
- Use full 64-bit arch timer counter for sched_clock
- Convert arch timer, sp804 and integrator-cp timers to CLKSRC_OF and
adapt all users to use clocksource_of_init

* tag 'clksrc-cleanup-for-3.10-part2' of git://sources.calxeda.com/kernel/linux:
  devtree: add binding documentation for sp804
  ARM: integrator-cp: convert use CLKSRC_OF for timer init
  ARM: versatile: use OF init for sp804 timer
  ARM: versatile: add versatile dtbs to dtbs target
  ARM: vexpress: remove extra timer-sp control register clearing
  ARM: dts: vexpress: disable CA9 core tile sp804 timer
  ARM: vexpress: remove sp804 OF init
  ARM: highbank: use OF init for sp804 timer
  ARM: timer-sp: convert to use CLKSRC_OF init
  OF: add empty of_device_is_available for !OF
  ARM: convert arm/arm64 arch timer to use CLKSRC_OF init
  ARM: make machine_desc->init_time default to clocksource_of_init
  ARM: arch_timer: use full 64-bit counter for sched_clock
  ARM: make sched_clock just call a function pointer
  ARM: sched_clock: allow changing to higher frequency counter

Signed-off-by: Olof Johansson <olof@lixom.net>

This has a nasty set of conflicts with the exynos MCT code, which was
moved in a separate branch, and then fixed up when merged in, but still
conflicts a bit here. It should have been sorted out by this merge though.
---

c3e0c873d0653e6e7628b5a8a9fcb3745444ca9e
diff --cc arch/arm/mach-omap2/timer.c
index f12aa6c15da,7dd6453a213..d5a13dcb64b
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -624,12 -620,10 +623,10 @@@ void __init omap5_realtime_timer_init(v
  {
  	int err;
  
 -	omap5_sync32k_timer_init();
 +	omap4_sync32k_timer_init();
  	realtime_counter_init();
  
- 	err = arch_timer_of_register();
- 	if (err)
- 		pr_err("%s: arch_timer_register failed %d\n", __func__, err);
+         clocksource_of_init();
  }
  #endif /* CONFIG_SOC_OMAP5 */
  
diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
index e8cd93a5c55,ea66316f0ac..fdf3894b1cc
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@@ -1031,13 -918,11 +1031,12 @@@ static const char *sh73a0_boards_compat
  };
  
  DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
 +	.smp		= smp_ops(sh73a0_smp_ops),
  	.map_io		= sh73a0_map_io,
 -	.init_early	= sh73a0_add_early_devices_dt,
 +	.init_early	= sh73a0_init_delay,
  	.nr_irqs	= NR_IRQS_LEGACY,
 -	.init_irq	= sh73a0_init_irq_dt,
 +	.init_irq	= irqchip_init,
  	.init_machine	= sh73a0_add_standard_devices_dt,
- 	.init_time	= shmobile_timer_init,
  	.dt_compat	= sh73a0_boards_compat_dt,
  MACHINE_END
  #endif /* CONFIG_USE_OF */
diff --cc drivers/clocksource/exynos_mct.c
index 957af8636c9,04aff6a61e8..b078d7cbc93
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@@ -20,11 -20,7 +20,10 @@@
  #include <linux/delay.h>
  #include <linux/percpu.h>
  #include <linux/of.h>
 +#include <linux/of_irq.h>
 +#include <linux/of_address.h>
 +#include <linux/clocksource.h>
  
- #include <asm/arch_timer.h>
  #include <asm/localtimer.h>
  
  #include <plat/cpu.h>