diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-10-04 10:04:57 +0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-10-08 17:38:47 +0400 |
| commit | e1c1575f831ab2165732037e6d664010a0149730 (patch) | |
| tree | ecfc90b06eb4b7402a3334ebe6b8287e73abc671 /arch/powerpc/platforms/85xx/mpc85xx_cds.c | |
| parent | c9438affcb7ac0dda4c6c6961637fb272f7c32d4 (diff) | |
| download | linux-e1c1575f831ab2165732037e6d664010a0149730.tar.xz | |
[POWERPC] 85xx/86xx: refactor RSTCR reset code
On the majority of 85xx & 86xx we have a register that's ability to
assert HRESET_REQ to reset the board. We refactored that code so it
can be shared between both platforms into fsl_soc.c and removed all
the duplication in each platform directory.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_cds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_cds.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index abc85b8d9f8a..afe5868cd975 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c @@ -46,7 +46,6 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> -#include "mpc85xx.h" static int cds_pci_slot = 2; static volatile u8 *cadmus; @@ -96,7 +95,7 @@ static void mpc85xx_cds_restart(char *cmd) * If we can't find the VIA chip (maybe the P2P bridge is disabled) * or the VIA chip reset didn't work, just use the default reset. */ - mpc85xx_restart(NULL); + fsl_rstcr_restart(NULL); } static void __init mpc85xx_cds_pci_irq_fixup(struct pci_dev *dev) @@ -343,7 +342,7 @@ define_machine(mpc85xx_cds) { .restart = mpc85xx_cds_restart, .pcibios_fixup_bus = fsl_pcibios_fixup_bus, #else - .restart = mpc85xx_restart, + .restart = fsl_rstcr_restart, #endif .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress, |