Merge branch 'clksrc' into devel
Russell King [Wed, 5 Jan 2011 18:09:03 +0000 (18:09 +0000)]
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile

12 files changed:
1  2 
arch/arm/Kconfig
arch/arm/common/timer-sp.c
arch/arm/include/asm/system.h
arch/arm/kernel/entry-common.S
arch/arm/kernel/smp.c
arch/arm/mach-realview/core.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-versatile/core.c
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-iop/time.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #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.
Simple merge
  #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"
  
  /*
  #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
@@@ -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>
  #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;
  }
@@@ -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