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 'viafb-next' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
common.c
diff --git
a/arch/arm/mach-kirkwood/common.c
b/arch/arm/mach-kirkwood/common.c
index
3688123
..
20e71df
100644
(file)
--- a/
arch/arm/mach-kirkwood/common.c
+++ b/
arch/arm/mach-kirkwood/common.c
@@
-21,6
+21,7
@@
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/timex.h>
#include <net/dsa.h>
#include <asm/page.h>
#include <asm/timex.h>
+#include <asm/kexec.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <mach/kirkwood.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <mach/kirkwood.h>
@@
-846,9
+847,14
@@
static void __init kirkwood_wdt_init(void)
/*****************************************************************************
* Time handling
****************************************************************************/
/*****************************************************************************
* Time handling
****************************************************************************/
+void __init kirkwood_init_early(void)
+{
+ orion_time_set_base(TIMER_VIRT_BASE);
+}
+
int kirkwood_tclk;
int kirkwood_tclk;
-int __init kirkwood_find_tclk(void)
+
static
int __init kirkwood_find_tclk(void)
{
u32 dev, rev;
{
u32 dev, rev;
@@
-864,7
+870,9
@@
int __init kirkwood_find_tclk(void)
static void __init kirkwood_timer_init(void)
{
kirkwood_tclk = kirkwood_find_tclk();
static void __init kirkwood_timer_init(void)
{
kirkwood_tclk = kirkwood_find_tclk();
- orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
+
+ orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
+ IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
}
struct sys_timer kirkwood_timer = {
}
struct sys_timer kirkwood_timer = {
@@
-1003,6
+1011,10
@@
void __init kirkwood_init(void)
kirkwood_xor0_init();
kirkwood_xor1_init();
kirkwood_crypto_init();
kirkwood_xor0_init();
kirkwood_xor1_init();
kirkwood_crypto_init();
+
+#ifdef CONFIG_KEXEC
+ kexec_reinit = kirkwood_enable_pcie;
+#endif
}
static int __init kirkwood_clock_gate(void)
}
static int __init kirkwood_clock_gate(void)