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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mv78xx0
/
common.c
diff --git
a/arch/arm/mach-mv78xx0/common.c
b/arch/arm/mach-mv78xx0/common.c
index
08465eb
..
44fb4e5
100644
(file)
--- a/
arch/arm/mach-mv78xx0/common.c
+++ b/
arch/arm/mach-mv78xx0/common.c
@@
-818,9
+818,15
@@
void __init mv78xx0_uart3_init(void)
/*****************************************************************************
* Time handling
****************************************************************************/
/*****************************************************************************
* Time handling
****************************************************************************/
+void __init mv78xx0_init_early(void)
+{
+ orion_time_set_base(TIMER_VIRT_BASE);
+}
+
static void mv78xx0_timer_init(void)
{
static void mv78xx0_timer_init(void)
{
- orion_time_init(IRQ_MV78XX0_TIMER_1, get_tclk());
+ orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
+ IRQ_MV78XX0_TIMER_1, get_tclk());
}
struct sys_timer mv78xx0_timer = {
}
struct sys_timer mv78xx0_timer = {