diff options
author | Eric Cooper <ecc@cmu.edu> | 2011-02-02 17:16:11 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-03-03 16:26:57 -0500 |
commit | 9c15364f83201802e995cbf72d833e5e1b3b9adb (patch) | |
tree | 0a2909e0049dd10c7256584a70adfa168bab0bae /arch/arm/mach-kirkwood | |
parent | 0e0cdd37709ba7ac9f0bff5de1b22f1b7987b04c (diff) |
[ARM] Kirkwood: enable PCIe for kexec
Use the machine-specific kexec_reinit hook to make sure
PCIe is enabled before starting a new kernel.
Signed-off-by: Eric Cooper <ecc@cmu.edu>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 3688123b5ad8..966df630b76f 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <net/dsa.h> | 21 | #include <net/dsa.h> |
22 | #include <asm/page.h> | 22 | #include <asm/page.h> |
23 | #include <asm/timex.h> | 23 | #include <asm/timex.h> |
24 | #include <asm/kexec.h> | ||
24 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
25 | #include <asm/mach/time.h> | 26 | #include <asm/mach/time.h> |
26 | #include <mach/kirkwood.h> | 27 | #include <mach/kirkwood.h> |
@@ -1003,6 +1004,10 @@ void __init kirkwood_init(void) | |||
1003 | kirkwood_xor0_init(); | 1004 | kirkwood_xor0_init(); |
1004 | kirkwood_xor1_init(); | 1005 | kirkwood_xor1_init(); |
1005 | kirkwood_crypto_init(); | 1006 | kirkwood_crypto_init(); |
1007 | |||
1008 | #ifdef CONFIG_KEXEC | ||
1009 | kexec_reinit = kirkwood_enable_pcie; | ||
1010 | #endif | ||
1006 | } | 1011 | } |
1007 | 1012 | ||
1008 | static int __init kirkwood_clock_gate(void) | 1013 | static int __init kirkwood_clock_gate(void) |