diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2009-08-14 18:13:53 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2009-08-25 03:48:13 +0200 |
| commit | 46c4c229ecf470202a1f4fd2402283cb038864bf (patch) | |
| tree | b30c9af6e6d2823818242a1dc9251a74c90585fa /arch/powerpc/sysdev | |
| parent | powerpc/85xx: sbc8560 - Fix warm reboot with board specific reset function (diff) | |
| download | linux-46c4c229ecf470202a1f4fd2402283cb038864bf.tar.xz linux-46c4c229ecf470202a1f4fd2402283cb038864bf.zip | |
powerpc/85xx: issue fsl_soc reboot warning only when applicable
Some CPU, like the MPC8560 don't have a RSTCR in the Global
Utilities Block. These boards will implement their own reboot
call, and not use this code, so we should only warn about the
absence of the GUTS RSTCR when the default reboot code is used.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 95dbc643c4fc..adca4affcf1f 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -37,6 +37,7 @@ #include <asm/irq.h> #include <asm/time.h> #include <asm/prom.h> +#include <asm/machdep.h> #include <sysdev/fsl_soc.h> #include <mm/mmu_decl.h> #include <asm/cpm2.h> @@ -383,8 +384,9 @@ static int __init setup_rstcr(void) if (!rstcr) printk (KERN_EMERG "Error: reset control register " "not mapped!\n"); - } else - printk (KERN_INFO "rstcr compatible register does not exist!\n"); + } else if (ppc_md.restart == fsl_rstcr_restart) + printk(KERN_ERR "No RSTCR register, warm reboot won't work\n"); + if (np) of_node_put(np); return 0; |