summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-01-24 15:16:32 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-01-29 12:12:17 +0100
commit0099a887c03b7dfe76e06496906dbb1e5c7f5df6 (patch)
treedb10f2d0c4326bf8e8ef40a242304e31e8612288 /drivers/watchdog
parentb34140af5b7a7e4b30ae9462aa977f4a92316f6d (diff)
downloadbarebox-0099a887c03b7dfe76e06496906dbb1e5c7f5df6.tar.gz
reset_source: rename set_reset_source to reset_source_set
To get all reset source related functions into the same function namespace. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/im28wd.c8
-rw-r--r--drivers/watchdog/imxwd.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/watchdog/im28wd.c b/drivers/watchdog/im28wd.c
index 6ae4cf8..dd66e12 100644
--- a/drivers/watchdog/im28wd.c
+++ b/drivers/watchdog/im28wd.c
@@ -163,20 +163,20 @@ static void __maybe_unused imx28_detect_reset_source(const struct imx28_wd *p)
if (reg & MXS_RTC_PERSISTENT0_ALARM_WAKE) {
writel(MXS_RTC_PERSISTENT0_ALARM_WAKE,
p->regs + MXS_RTC_PERSISTENT0 + MXS_RTC_CLR_ADDR);
- set_reset_source(RESET_WKE);
+ reset_source_set(RESET_WKE);
return;
}
- set_reset_source(RESET_POR);
+ reset_source_set(RESET_POR);
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);
+ reset_source_set(RESET_RST);
return;
}
- set_reset_source(RESET_RST);
+ reset_source_set(RESET_RST);
}
static int imx28_wd_probe(struct device_d *dev)
diff --git a/drivers/watchdog/imxwd.c b/drivers/watchdog/imxwd.c
index f5910ac..63c5605 100644
--- a/drivers/watchdog/imxwd.c
+++ b/drivers/watchdog/imxwd.c
@@ -130,17 +130,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);
+ reset_source_set(RESET_POR);
return;
}
if (val & (WSTR_HARDRESET | WSTR_WARMSTART)) {
- set_reset_source(RESET_RST);
+ reset_source_set(RESET_RST);
return;
}
if (val & WSTR_WDOG) {
- set_reset_source(RESET_WDG);
+ reset_source_set(RESET_WDG);
return;
}