Skip to contentSkip to conversation

ARM: Kirkwood: Remove redundant kexec code

PATCH New Andrew Lunn 3 participants 3 messages Feb 24, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/mach-kirkwood/board-dt.c | 5 -----
 1 file changed, 5 deletions(-)
arch/arm/mach-kirkwood/board-dt.c +0 -5
index ec0702c02d6c..2801da49e2a3 100644
@@ -19,7 +19,6 @@
 #include <linux/of_platform.h>
 #include <linux/dma-mapping.h>
 #include <linux/irqchip.h>
-#include <linux/kexec.h>
 #include <asm/hardware/cache-feroceon-l2.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -207,10 +206,6 @@ static void __init kirkwood_dt_init(void)
 	kirkwood_pm_init();
 	kirkwood_dt_eth_fixup();
 
-#ifdef CONFIG_KEXEC
-	kexec_reinit = kirkwood_enable_pcie;
-#endif
-
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 1/1 ARM: Kirkwood: Remove redundant kexec code

Quoted 5 lines · On Monday 24 February 2014 19:09:24 Andrew Lunn wrote:

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.

It's probably worth mentioning in the changelog that this fixes a build error for the case when CONFIG_KEXEC is enabled but KIRKWOOD_LEGACY is not.

Arnd

Applied
#2 lore raw

PATCH 1/1 ARM: Kirkwood: Remove redundant kexec code

In reply to Andrew Lunn
Quoted 8 lines · Andrew Lunn

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.

---
 arch/arm/mach-kirkwood/board-dt.c | 5 -----
 1 file changed, 5 deletions(-)

Applied to mvebu/soc-kw with Arnd's Ack. Also, added the comment to the commit log regarding the build error it was fixing.

thx,

Jason.