[ARM] Kirkwood: enable PCIe for kexec
authorEric Cooper <ecc@cmu.edu>
Wed, 2 Feb 2011 22:16:11 +0000 (17:16 -0500)
committerNicolas Pitre <nico@fluxnic.net>
Thu, 3 Mar 2011 21:26:57 +0000 (16:26 -0500)
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>
arch/arm/mach-kirkwood/common.c

index 3688123b5ad8e5ea233b1346f22d19e3ec149030..966df630b76f65bf6d2c1909deaa770562b6b465 100644 (file)
@@ -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)