Skip to content

Commit

Permalink
powerpc/85xx: issue fsl_soc reboot warning only when applicable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Gortmaker authored and Kumar Gala committed Aug 25, 2009
1 parent 7792da8 commit 46c4c22
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/powerpc/sysdev/fsl_soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 46c4c22

Please sign in to comment.