提交 46c4c229 编写于 作者: P Paul Gortmaker 提交者: Kumar Gala

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: NPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
上级 7792da85
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/machdep.h>
#include <sysdev/fsl_soc.h> #include <sysdev/fsl_soc.h>
#include <mm/mmu_decl.h> #include <mm/mmu_decl.h>
#include <asm/cpm2.h> #include <asm/cpm2.h>
...@@ -383,8 +384,9 @@ static int __init setup_rstcr(void) ...@@ -383,8 +384,9 @@ static int __init setup_rstcr(void)
if (!rstcr) if (!rstcr)
printk (KERN_EMERG "Error: reset control register " printk (KERN_EMERG "Error: reset control register "
"not mapped!\n"); "not mapped!\n");
} else } else if (ppc_md.restart == fsl_rstcr_restart)
printk (KERN_INFO "rstcr compatible register does not exist!\n"); printk(KERN_ERR "No RSTCR register, warm reboot won't work\n");
if (np) if (np)
of_node_put(np); of_node_put(np);
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册