aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2014-02-24 13:09:24 -0500
committerJason Cooper <jason@lakedaemon.net>2014-02-24 13:48:56 -0500
commit5a51da2512513c5876340d7b4b84cc86ad1f4bfe (patch)
tree9d5ea8c8298945fc9e62dde7a2c62b8a641a0c89
parentc3f08d0d5966f72f294f669e25ae4996f4885da0 (diff)
ARM: kirkwood: Remove redundant kexec code
The PCIe driver has been fully clock aware for quite a while. Remove the kexec code to enable the PCIe clock, since the PCIe driver will do the right thing. jac adds: [arnd]: fixes a build error when KEXEC is enabled and KIRKWOOD_LEGACY is not Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/mach-kirkwood/board-dt.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index ec0702c02d6c..2801da49e2a3 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -19,7 +19,6 @@
19#include <linux/of_platform.h> 19#include <linux/of_platform.h>
20#include <linux/dma-mapping.h> 20#include <linux/dma-mapping.h>
21#include <linux/irqchip.h> 21#include <linux/irqchip.h>
22#include <linux/kexec.h>
23#include <asm/hardware/cache-feroceon-l2.h> 22#include <asm/hardware/cache-feroceon-l2.h>
24#include <asm/mach/arch.h> 23#include <asm/mach/arch.h>
25#include <asm/mach/map.h> 24#include <asm/mach/map.h>
@@ -207,10 +206,6 @@ static void __init kirkwood_dt_init(void)
207 kirkwood_pm_init(); 206 kirkwood_pm_init();
208 kirkwood_dt_eth_fixup(); 207 kirkwood_dt_eth_fixup();
209 208
210#ifdef CONFIG_KEXEC
211 kexec_reinit = kirkwood_enable_pcie;
212#endif
213
214 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 209 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
215} 210}
216 211