git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-versatile
/
core.c
diff --git
a/arch/arm/mach-versatile/core.c
b/arch/arm/mach-versatile/core.c
index
e38acb0
..
13a83e4
100644
(file)
--- a/
arch/arm/mach-versatile/core.c
+++ b/
arch/arm/mach-versatile/core.c
@@
-31,8
+31,8
@@
#include <linux/amba/pl022.h>
#include <linux/io.h>
#include <linux/gfp.h>
#include <linux/amba/pl022.h>
#include <linux/io.h>
#include <linux/gfp.h>
+#include <linux/clkdev.h>
-#include <asm/clkdev.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/leds.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/leds.h>
@@
-46,10
+46,11
@@
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
-#include <mach/clkdev.h>
#include <mach/hardware.h>
#include <mach/platform.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 "core.h"
@@
-885,6
+886,12
@@
void __init versatile_init(void)
#endif
}
#endif
}
+/*
+ * The sched_clock counter
+ */
+#define REFCOUNTER (__io_address(VERSATILE_SYS_BASE) + \
+ VERSATILE_SYS_24MHz_OFFSET)
+
/*
* Where is the timer (VA)?
*/
/*
* Where is the timer (VA)?
*/
@@
-900,6
+907,8
@@
static void __init versatile_timer_init(void)
{
u32 val;
{
u32 val;
+ versatile_sched_clock_init(REFCOUNTER, 24000000);
+
/*
* set clock frequency:
* VERSATILE_REFCLK is 32KHz
/*
* set clock frequency:
* VERSATILE_REFCLK is 32KHz