Merge remote-tracking branch 'maz/timers-v3.4-rc4' into android-t114-3.4-rebased
Varun Wadekar [Thu, 21 Jun 2012 06:24:00 +0000 (11:24 +0530)]
Conflicts:
Documentation/devicetree/bindings/arm/arch_timer.txt
arch/arm/Kconfig
arch/arm/include/asm/arch_timer.h
arch/arm/kernel/arch_timer.c
arch/arm/kernel/smp.c

Change-Id: I37b071c41d3daf0dc09f0f4366e2269b9a2ee154
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

1  2 
Documentation/devicetree/bindings/arm/arch_timer.txt
arch/arm/include/asm/arch_timer.h
arch/arm/kernel/Makefile
arch/arm/kernel/arch_timer.c
arch/arm/kernel/smp.c
arch/arm/mach-vexpress/v2m.c

@@@ -8,9 -7,10 +8,10 @@@ interrupts (one for the secure mode, on
  
  ** Timer node properties:
  
 -- compatible : Should at least contain "arm,armv7-timer".
 +- compatible : Should be "arm,armv7-timer"
  
- - interrupts : One or two interrupts for secure and non-secure mode
+ - interrupts : Interrupt list for secure, non-secure, virtual and
+   hypervisor timers, in that order.
  
  - clock-frequency : The frequency of the main counter, in Hz. Optional.
  
@@@ -1,17 -1,11 +1,17 @@@
  #ifndef __ASMARM_ARCH_TIMER_H
  #define __ASMARM_ARCH_TIMER_H
  
 +#include <linux/ioport.h>
 +
 +struct arch_timer {
 +      struct resource res[2];
 +};
 +
  #ifdef CONFIG_ARM_ARCH_TIMER
- int arch_timer_register(struct arch_timer *);
+ int arch_timer_of_register(void);
  int arch_timer_sched_clock_init(void);
  #else
- static inline int arch_timer_register(struct arch_timer *at)
+ static inline int arch_timer_of_register(void)
  {
        return -ENXIO;
  }
Simple merge
Simple merge
Simple merge
  #include <linux/clkdev.h>
  #include <linux/mtd/physmap.h>
  
+ #include <asm/arch_timer.h>
  #include <asm/mach-types.h>
 +#include <asm/soc.h>
  #include <asm/sizes.h>
+ #include <asm/smp_twd.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>