Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46c4c229 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Kumar Gala
Browse files

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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 7792da85

arch/powerpc/sysdev/fsl_soc.c

+4 −2
Original line number Diff line number Diff line
@@ -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;