diff options
author | Stefan Roese <sr@denx.de> | 2008-03-27 10:43:31 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-04-02 21:44:56 -0400 |
commit | 93173ce272e54f81460986ff5040d16ab79488a9 (patch) | |
tree | 7bb4e15ac4cf3853f81e358fb1b21aa2fef6b4ce /arch/powerpc/platforms/44x/warp.c | |
parent | d2477b5cc8ca95b8c15133ffbbebf0bd9783f560 (diff) |
[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/warp.c')
-rw-r--r-- | arch/powerpc/platforms/44x/warp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c index da5b7b7599db..39cf6150a72b 100644 --- a/arch/powerpc/platforms/44x/warp.c +++ b/arch/powerpc/platforms/44x/warp.c | |||
@@ -18,9 +18,7 @@ | |||
18 | #include <asm/udbg.h> | 18 | #include <asm/udbg.h> |
19 | #include <asm/time.h> | 19 | #include <asm/time.h> |
20 | #include <asm/uic.h> | 20 | #include <asm/uic.h> |
21 | 21 | #include <asm/ppc4xx.h> | |
22 | #include "44x.h" | ||
23 | |||
24 | 22 | ||
25 | static __initdata struct of_device_id warp_of_bus[] = { | 23 | static __initdata struct of_device_id warp_of_bus[] = { |
26 | { .compatible = "ibm,plb4", }, | 24 | { .compatible = "ibm,plb4", }, |
@@ -49,7 +47,7 @@ define_machine(warp) { | |||
49 | .progress = udbg_progress, | 47 | .progress = udbg_progress, |
50 | .init_IRQ = uic_init_tree, | 48 | .init_IRQ = uic_init_tree, |
51 | .get_irq = uic_get_irq, | 49 | .get_irq = uic_get_irq, |
52 | .restart = ppc44x_reset_system, | 50 | .restart = ppc4xx_reset_system, |
53 | .calibrate_decr = generic_calibrate_decr, | 51 | .calibrate_decr = generic_calibrate_decr, |
54 | }; | 52 | }; |
55 | 53 | ||