Today we need to read the code to understand it
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
---
arch/arm/mach-imx/imx1.c | 6 +++---
arch/arm/mach-samsung/reset_source.c | 6 +++---
common/reset_source.c | 14 +++++++-------
drivers/watchdog/im28wd.c | 6 +++---
drivers/watchdog/imxwd.c | 6 +++---
include/reset_source.h | 10 +++++-----
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/arch/arm/mach-imx/imx1.c b/arch/arm/mach-imx/imx1.c
index 18901ea..53ee788 100644
--- a/arch/arm/mach-imx/imx1.c
+++ b/arch/arm/mach-imx/imx1.c
@@ -29,13 +29,13 @@ static void imx1_detect_reset_source(void)
switch (val) {
case RSR_EXR:
- set_reset_source(RESET_RST);
+ set_reset_source(RESET_RESET);
return;
case RSR_WDR:
- set_reset_source(RESET_WDG);
+ set_reset_source(RESET_WATCHDOG);
return;
case 0:
- set_reset_source(RESET_POR);
+ set_reset_source(RESET_POWER);
return;
default:
/* else keep the default 'unknown' state */
diff --git a/arch/arm/mach-samsung/reset_source.c
b/arch/arm/mach-samsung/reset_source.c
index 2456e3f..e2b8808 100644
--- a/arch/arm/mach-samsung/reset_source.c
+++ b/arch/arm/mach-samsung/reset_source.c
@@ -29,21 +29,21 @@ static int s3c_detect_reset_source(void)
u32 reg = readl(S3C_GPIO_BASE + S3C2440_GSTATUS2);
if (reg & S3C2440_GSTATUS2_PWRST) {
- set_reset_source(RESET_POR);
+ set_reset_source(RESET_POWER);
writel(S3C2440_GSTATUS2_PWRST,
S3C_GPIO_BASE + S3C2440_GSTATUS2);
return 0;
}
if (reg & S3C2440_GSTATUS2_SLEEPRST) {
- set_reset_source(RESET_WKE);
+ set_reset_source(RESET_WAKEUP);
writel(S3C2440_GSTATUS2_SLEEPRST,
S3C_GPIO_BASE + S3C2440_GSTATUS2);
return 0;
}
if (reg & S3C2440_GSTATUS2_WDRST) {
- set_reset_source(RESET_WDG);
+ set_reset_source(RESET_WATCHDOG);
writel(S3C2440_GSTATUS2_WDRST,
S3C_GPIO_BASE + S3C2440_GSTATUS2);
return 0;
diff --git a/common/reset_source.c b/common/reset_source.c
index 2a7f9ff..ff76857 100644
--- a/common/reset_source.c
+++ b/common/reset_source.c
@@ -19,12 +19,12 @@
#include <reset_source.h>
static const char * const reset_src_names[] = {
- [RESET_UKWN] = "unknown",
- [RESET_POR] = "POR",
- [RESET_RST] = "RST",
- [RESET_WDG] = "WDG",
- [RESET_WKE] = "WKE",
- [RESET_JTAG] = "JTAG",
+ [RESET_UKWNOWN] = "unknown",
+ [RESET_POWER] = "power",
+ [RESET_RESET] = "reset",
+ [RESET_WATCHDOG] = "watchdog",
+ [RESET_WAKEUP] = "wakeup",
+ [RESET_JTAG] = "jtag",
};
void set_reset_source(enum reset_src_type st)
@@ -37,7 +37,7 @@ EXPORT_SYMBOL(set_reset_source);
static int init_reset_source(void)
{
globalvar_add_simple("system.reset");
- set_reset_source(RESET_UKWN);
+ set_reset_source(RESET_UKWNOWN);
return 0;
}
diff --git a/drivers/watchdog/im28wd.c b/drivers/watchdog/im28wd.c
index ca32a72..999f5b4 100644
--- a/drivers/watchdog/im28wd.c
+++ b/drivers/watchdog/im28wd.c
@@ -82,17 +82,17 @@ static void __maybe_unused imx28_detect_reset_source(const
struct imx28_wd *p)
if (reg & MXS_RTC_PERSISTENT0_EXT_RST) {
writel(MXS_RTC_PERSISTENT0_EXT_RST,
p->regs + MXS_RTC_PERSISTENT0 + MXS_RTC_CLR_ADDR);
- set_reset_source(RESET_POR);
+ set_reset_source(RESET_POWER);
return;
}
if (reg & MXS_RTC_PERSISTENT0_THM_RST) {
writel(MXS_RTC_PERSISTENT0_THM_RST,
p->regs + MXS_RTC_PERSISTENT0 + MXS_RTC_CLR_ADDR);
- set_reset_source(RESET_RST);
+ set_reset_source(RESET_RESET);
return;
}
- set_reset_source(RESET_RST);
+ set_reset_source(RESET_RESET);
}
static int imx28_wd_probe(struct device_d *dev)
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index c422f98..b13247b 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -129,17 +129,17 @@ static void imx_watchdog_detect_reset_source(struct
imx_wd *priv)
u16 val = readw(priv->base + IMX21_WDOG_WSTR);
if (val & WSTR_COLDSTART) {
- set_reset_source(RESET_POR);
+ set_reset_source(RESET_POWER);
return;
}
if (val & (WSTR_HARDRESET | WSTR_WARMSTART)) {
- set_reset_source(RESET_RST);
+ set_reset_source(RESET_RESET);
return;
}
if (val & WSTR_WDOG) {
- set_reset_source(RESET_WDG);
+ set_reset_source(RESET_WATCHDOG);
return;
}
diff --git a/include/reset_source.h b/include/reset_source.h
index 75e7ba8..1db1f4f 100644
--- a/include/reset_source.h
+++ b/include/reset_source.h
@@ -14,11 +14,11 @@
# define __INCLUDE_RESET_SOURCE_H
enum reset_src_type {
- RESET_UKWN, /* maybe the SoC cannot detect the reset source */
- RESET_POR, /* Power On Reset (cold start) */
- RESET_RST, /* generic ReSeT (warm start) */
- RESET_WDG, /* watchdog */
- RESET_WKE, /* wake-up (some SoCs can handle this) */
+ RESET_UKWNOWN, /* maybe the SoC cannot detect the reset source */
+ RESET_POWER, /* Power On Reset (cold start) */
+ RESET_RESET, /* generic ReSeT (warm start) */
+ RESET_WATCHDOG, /* watchdog */
+ RESET_WAKEUP, /* wake-up (some SoCs can handle this) */
RESET_JTAG, /* JTAG reset */
};
--
1.7.10.4
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
