summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Cooper <ecc@cmu.edu>2011-02-02 23:16:11 +0100
committerNicolas Pitre <nico@fluxnic.net>2011-03-03 22:26:57 +0100
commit9c15364f83201802e995cbf72d833e5e1b3b9adb (patch)
tree0a2909e0049dd10c7256584a70adfa168bab0bae
parent[ARM] Kirkwood: enable PCIe before reading device ID register (diff)
downloadlinux-9c15364f83201802e995cbf72d833e5e1b3b9adb.tar.xz
linux-9c15364f83201802e995cbf72d833e5e1b3b9adb.zip
[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>
-rw-r--r--arch/arm/mach-kirkwood/common.c5
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 @@
#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>
@@ -1003,6 +1004,10 @@ void __init kirkwood_init(void)
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)