diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:55 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-02-03 09:55:55 +0100 |
| commit | adbf51abdec9a50ee88a117353441211f1b9d6aa (patch) | |
| tree | bda741154a075b519ddbbae856d1a048e3f3029d /drivers | |
| parent | ada75addeea07e91b6e689894a0ef826b0c176dc (diff) | |
| parent | 706cef7e5bd9faafeb1ec599bf5270ea07063d56 (diff) | |
| download | barebox-adbf51abdec9a50ee88a117353441211f1b9d6aa.tar.gz barebox-adbf51abdec9a50ee88a117353441211f1b9d6aa.tar.xz | |
Merge branch 'for-next/pxa'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/im28wd.c | 8 | ||||
| -rw-r--r-- | drivers/watchdog/imxwd.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/watchdog/im28wd.c b/drivers/watchdog/im28wd.c index 6ae4cf832f..dd66e12fc0 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 f5910ac0a9..63c5605c99 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; } |