| Message ID | 1303148292-26770-1-git-send-email-fabio.estevam@freescale.com |
|---|---|
| State | Accepted |
| Commit | 25d8e1bb197e9d3b165b64202014565e8be5a6c4 |
| Delegated to: | Stefano Babic |
| Headers | show |
Hi Fabio, > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > Changes since v4: > - Make get_reset_cause CPU specific code and no need to > add any board specific call. > > arch/arm/cpu/arm1136/mx31/generic.c | 29 ++++++++++++++++++++++++++++- > 1 files changed, 28 insertions(+), 1 deletions(-) Thanks, this looks good. Now all i.MX31 boards profit! Acked-by: Detlev Zundel <dzu@denx.de>
Le 19/04/2011 17:17, Detlev Zundel a écrit : > Hi Fabio, > >> Signed-off-by: Fabio Estevam<fabio.estevam@freescale.com> >> --- >> Changes since v4: >> - Make get_reset_cause CPU specific code and no need to >> add any board specific call. >> >> arch/arm/cpu/arm1136/mx31/generic.c | 29 ++++++++++++++++++++++++++++- >> 1 files changed, 28 insertions(+), 1 deletions(-) > > Thanks, this looks good. Now all i.MX31 boards profit! > > Acked-by: Detlev Zundel<dzu@denx.de> Stefano, does this get in your tree? Amicalement,
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index 9b7a7a2..a92731e 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -132,11 +132,38 @@ char *get_cpu_rev(void) return "unknown"; } +char *get_reset_cause(void) +{ + /* read RCSR register from CCM module */ + struct clock_control_regs *ccm = + (struct clock_control_regs *)CCM_BASE; + + u32 cause = readl(&ccm->rcsr) & 0x07; + + switch (cause) { + case 0x0000: + return "POR"; + break; + case 0x0001: + return "RST"; + break; + case 0x0002: + return "WDOG"; + break; + case 0x0006: + return "JTAG"; + break; + default: + return "unknown reset"; + } +} + #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo (void) { - printf("CPU: Freescale i.MX31 rev %s at %d MHz\n", + printf("CPU: Freescale i.MX31 rev %s at %d MHz.", get_cpu_rev(), mx31_get_mcu_main_clk() / 1000000); + printf("Reset cause: %s\n", get_reset_cause()); return 0; } #endif
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- Changes since v4: - Make get_reset_cause CPU specific code and no need to add any board specific call. arch/arm/cpu/arm1136/mx31/generic.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-)