diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-09-08 09:51:05 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-09-08 09:51:05 +0000 |
| commit | 2daf0ae2046f31ef96f2a413955032e0cded60f1 (patch) | |
| tree | 61a81d8d65835646b47deeba086f086a431e6a4e /target/linux/mcs814x/files-3.3/drivers/watchdog/mcs814x_wdt.c | |
| parent | 406c2c85c7aec1847bec4f34c918fbe3f8fa31a6 (diff) | |
| download | upstream-2daf0ae2046f31ef96f2a413955032e0cded60f1.tar.gz upstream-2daf0ae2046f31ef96f2a413955032e0cded60f1.tar.bz2 upstream-2daf0ae2046f31ef96f2a413955032e0cded60f1.zip | |
[mcs814x] use the recommended ARM I/O accessors
use {read,write}l_relaxed instead of the plain __raw_{read,write}l variants.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33330 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mcs814x/files-3.3/drivers/watchdog/mcs814x_wdt.c')
| -rw-r--r-- | target/linux/mcs814x/files-3.3/drivers/watchdog/mcs814x_wdt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mcs814x/files-3.3/drivers/watchdog/mcs814x_wdt.c b/target/linux/mcs814x/files-3.3/drivers/watchdog/mcs814x_wdt.c index d2f4c5994f..ca69e8f955 100644 --- a/target/linux/mcs814x/files-3.3/drivers/watchdog/mcs814x_wdt.c +++ b/target/linux/mcs814x/files-3.3/drivers/watchdog/mcs814x_wdt.c @@ -49,9 +49,9 @@ static int mcs814x_wdt_start(struct watchdog_device *dev) u32 reg; spin_lock(&wdt->lock); - reg = __raw_readl(wdt->regs + WDT_CTRL); + reg = readl_relaxed(wdt->regs + WDT_CTRL); reg |= WDT_CTRL_EN; - __raw_writel(reg, wdt->regs + WDT_CTRL); + writel_relaxed(reg, wdt->regs + WDT_CTRL); spin_unlock(&wdt->lock); return 0; @@ -63,9 +63,9 @@ static int mcs814x_wdt_stop(struct watchdog_device *dev) u32 reg; spin_lock(&wdt->lock); - reg = __raw_readl(wdt->regs + WDT_CTRL); + reg = readl_relaxed(wdt->regs + WDT_CTRL); reg &= ~WDT_CTRL_EN; - __raw_writel(reg, wdt->regs + WDT_CTRL); + writel_relaxed(reg, wdt->regs + WDT_CTRL); spin_unlock(&wdt->lock); return 0; @@ -80,7 +80,7 @@ static int mcs814x_wdt_set_timeout(struct watchdog_device *dev, /* watchdog counts upward and rollover (0xfffffff -> 0) * triggers the reboot */ - __raw_writel(WDT_MAX_VALUE - (new_timeout * clk_get_rate(wdt->clk)), + writel_relaxed(WDT_MAX_VALUE - (new_timeout * clk_get_rate(wdt->clk)), wdt->regs + WDT_COUNT); spin_unlock(&wdt->lock); |