From: Eric Cooper <ecc@cmu.edu>
Date: Wed, 2 Feb 2011 22:16:11 +0000 (-0500)
Subject: [ARM] Kirkwood: enable PCIe for kexec
X-Git-Tag: v2.6.39-rc1~434^2~6^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9c15364f83201802e995cbf72d833e5e1b3b9adb;p=karo-tx-linux.git

[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>
---

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)