[PATCH 1/2] powerpc: issue fsl_soc reboot warning only when applicable

[PATCH 1/2] powerpc: issue fsl_soc reboot warning only when applicable

[Paul Gortmaker]

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>
---
 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 95dbc64..adca4af 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;
-- 
1.6.3.3

[PATCH 2/2] sbc8560: remove "has-rstcr" from global utilities block

[Paul Gortmaker]

The earlier mpc8560 CPUs don't have the RSTCR at 0xe00b0
in the GUTS.  The generic reboot code uses this tag to
determine if it should be using the RSTCR for reboot, so
remove it from the board definition.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/powerpc/boot/dts/sbc8560.dts |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/boot/dts/sbc8560.dts b/arch/powerpc/boot/dts/sbc8560.dts
index 239d57a..9e13ed8 100644
--- a/arch/powerpc/boot/dts/sbc8560.dts
+++ b/arch/powerpc/boot/dts/sbc8560.dts
@@ -303,7 +303,6 @@
 		global-utilities@e0000 {
 			compatible = "fsl,mpc8560-guts";
 			reg = <0xe0000 0x1000>;
-			fsl,has-rstcr;
 		};
 	};
 
-- 
1.6.3.3

Re: [PATCH 2/2] sbc8560: remove "has-rstcr" from global utilities block

[Kumar Gala]

On Aug 14, 2009, at 11:13 AM, Paul Gortmaker wrote:

> The earlier mpc8560 CPUs don't have the RSTCR at 0xe00b0
> in the GUTS.  The generic reboot code uses this tag to
> determine if it should be using the RSTCR for reboot, so
> remove it from the board definition.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> arch/powerpc/boot/dts/sbc8560.dts |    1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)


applied to next

- k

Re: [PATCH 1/2] powerpc: issue fsl_soc reboot warning only when applicable

[Kumar Gala]

On Aug 14, 2009, at 11:13 AM, Paul Gortmaker wrote:

> 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>
> ---
> arch/powerpc/sysdev/fsl_soc.c |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)


applied to next

- k