From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 5 Jan 2011 18:09:03 +0000 (+0000)
Subject: Merge branch 'clksrc' into devel
X-Git-Tag: v2.6.38-rc1~471^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58daf18cdcab550262a5f4681e1f1e073e21965a;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'clksrc' into devel

Conflicts:
	arch/arm/mach-vexpress/v2m.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-versatile/Makefile
---

58daf18cdcab550262a5f4681e1f1e073e21965a
diff --cc arch/arm/mach-realview/core.c
index 14fbe50,3d653e0..aad806c
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@@ -50,10 -50,15 +50,12 @@@
  #include <mach/clkdev.h>
  #include <mach/platform.h>
  #include <mach/irqs.h>
 -#include <plat/timer-sp.h>
 +#include <asm/hardware/timer-sp.h>
  
+ #include <plat/sched_clock.h>
+ 
  #include "core.h"
  
 -/* used by entry-macro.S and platsmp.c */
 -void __iomem *gic_cpu_base_addr;
 -
  #ifdef CONFIG_ZONE_DMA
  /*
   * Adjust the zones if there are restrictions for DMA access.
diff --cc arch/arm/mach-versatile/core.c
index 6b93bd6,56cdc22..40a024c
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@@ -49,8 -49,10 +49,10 @@@
  #include <mach/clkdev.h>
  #include <mach/hardware.h>
  #include <mach/platform.h>
 -#include <plat/timer-sp.h>
 +#include <asm/hardware/timer-sp.h>
  
+ #include <plat/sched_clock.h>
+ 
  #include "core.h"
  
  /*
diff --cc arch/arm/mach-vexpress/v2m.c
index 91ff2e0,8c28310..de13603
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -18,12 -18,14 +18,13 @@@
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>
  #include <asm/hardware/arm_timer.h>
++#include <asm/hardware/timer-sp.h>
  
  #include <mach/clkdev.h>
  #include <mach/motherboard.h>
  
- #include <asm/hardware/timer-sp.h>
+ #include <plat/sched_clock.h>
  
 -#include <plat/timer-sp.h>
 -
  #include "core.h"
  
  #define V2M_PA_CS0	0x40000000
diff --cc arch/arm/plat-iop/time.c
index 558cdfa,2db6e60..07f23bb
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@@ -17,8 -17,8 +17,9 @@@
  #include <linux/interrupt.h>
  #include <linux/time.h>
  #include <linux/init.h>
+ #include <linux/sched.h>
  #include <linux/timex.h>
 +#include <linux/sched.h>
  #include <linux/io.h>
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
diff --cc arch/arm/plat-omap/counter_32k.c
index 8722a13,1b558efb..ea46440
--- a/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@@ -15,8 -15,10 +15,11 @@@
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/clk.h>
- #include <linux/io.h>
 +#include <linux/err.h>
+ #include <linux/io.h>
+ #include <linux/sched.h>
+ 
+ #include <asm/sched_clock.h>
  
  #include <plat/common.h>
  #include <plat/board.h>
@@@ -165,16 -181,16 +182,16 @@@ static int __init omap_init_clocksource
  			return -ENODEV;
  
  		sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
 -		if (sync_32k_ick)
 +		if (!IS_ERR(sync_32k_ick))
  			clk_enable(sync_32k_ick);
  
- 		clocksource_32k.mult = clocksource_hz2mult(32768,
- 					    clocksource_32k.shift);
- 
  		offset_32k = clocksource_32k.read(&clocksource_32k);
  
- 		if (clocksource_register(&clocksource_32k))
+ 		if (clocksource_register_hz(&clocksource_32k, 32768))
  			printk(err, clocksource_32k.name);
+ 
+ 		init_fixed_sched_clock(&cd, omap_update_sched_clock, 32,
+ 				       32768, SC_MULT, SC_SHIFT);
  	}
  	return 0;
  }
diff --cc arch/arm/plat-versatile/Makefile
index aaa571d,8bb6ba6..16dde08
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@@ -1,6 -1,8 +1,7 @@@
  obj-y	:= clock.o
- obj-$(CONFIG_ARCH_REALVIEW) += sched-clock.o
- obj-$(CONFIG_ARCH_VERSATILE) += sched-clock.o
 -obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
+ ifneq ($(CONFIG_ARCH_INTEGRATOR),y)
+ obj-y	+= sched-clock.o
+ endif
  ifeq ($(CONFIG_LEDS_CLASS),y)
  obj-$(CONFIG_ARCH_REALVIEW) += leds.o
  obj-$(CONFIG_ARCH_VERSATILE) += leds.o