aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/44x/ebony.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-03-28 01:43:31 +1100
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-04-02 20:44:56 -0500
commit93173ce272e54f81460986ff5040d16ab79488a9 (patch)
tree7bb4e15ac4cf3853f81e358fb1b21aa2fef6b4ce /arch/powerpc/platforms/44x/ebony.c
parent[POWERPC] bootwrapper: Add a firmware-independent simpleboot target. (diff)
downloadlinux-dev-93173ce272e54f81460986ff5040d16ab79488a9.tar.xz
linux-dev-93173ce272e54f81460986ff5040d16ab79488a9.zip
[POWERPC] 4xx: Create common ppc4xx_reset_system() in ppc4xx_soc.c
This patch creates a common system reset routine for all 40x and 44x systems. Previously only a 44x routine existed. But since this system reset via the debug control register is common for 40x and 44x let's share this code for all those platforms in ppc4xx_soc.c. This patch also enables CONFIG_4xx_SOC for all 40x and 44x platforms. Tested on Kilauea (405EX) and Canyonlands (440EX). Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/platforms/44x/ebony.c')
-rw-r--r--arch/powerpc/platforms/44x/ebony.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 1a8d467bff85..a0e8fe4662f6 100644
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -26,8 +26,7 @@
#include <asm/time.h>
#include <asm/uic.h>
#include <asm/pci-bridge.h>
-
-#include "44x.h"
+#include <asm/ppc4xx.h>
static __initdata struct of_device_id ebony_of_bus[] = {
{ .compatible = "ibm,plb4", },
@@ -66,6 +65,6 @@ define_machine(ebony) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
- .restart = ppc44x_reset_system,
+ .restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};