redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[WATCHDOG] omap_wdt.c: another ioremap() fix

Browse source 
convert to use ioremap() and __raw_{read/write} friends.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: George G. Davis <gdavis@mvista.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Felipe Balbi 2008-09-20 04:14:02 +03:00 committed by Wim Van Sebroeck
parent 2817142f31
commit 9f69e3b0c2
1 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/watchdog/omap_wdt.c
View file

@ -71,12 +71,12 @@ static void omap_wdt_ping(struct omap_wdt_dev *wdev)
{
void __iomem *base = wdev->base;
/* wait for posted write to complete */
while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
cpu_relax();
wdt_trgr_pattern = ~wdt_trgr_pattern;
omap_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
__raw_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
/* wait for posted write to complete */
while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x08)
cpu_relax();
/* reloaded WCRR from WLDR */
}
@ -86,11 +86,11 @@ static void omap_wdt_enable(struct omap_wdt_dev *wdev)
void __iomem *base;
base = wdev->base;
/* Sequence to enable the watchdog */
omap_writel(0xBBBB, base + OMAP_WATCHDOG_SPR);
while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
__raw_writel(0xBBBB, base + OMAP_WATCHDOG_SPR);
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
cpu_relax();
omap_writel(0x4444, base + OMAP_WATCHDOG_SPR);
while ((omap_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
__raw_writel(0x4444, base + OMAP_WATCHDOG_SPR);
while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) & 0x10)
cpu_relax();
}
@ -99,11 +99,11 @@ static void omap_wdt_disable(struct omap_wdt_dev *wdev)
void __iomem *base;
base = wdev->base;
/* sequence required to disable watchdog */
omap_writel(0xAAAA, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
__raw_writel(0xAAAA, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
cpu_relax();
omap_writel(0x5555, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
__raw_writel(0x5555, base + OMAP_WATCHDOG_SPR); /* TIMER_MODE */
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x10)
cpu_relax();
}
@ -123,10 +123,10 @@ static void omap_wdt_set_timeout(struct omap_wdt_dev *wdev)
base = wdev->base;
/* just count up at 32 KHz */
while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
cpu_relax();
omap_writel(pre_margin, base + OMAP_WATCHDOG_LDR);
while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
__raw_writel(pre_margin, base + OMAP_WATCHDOG_LDR);
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x04)
cpu_relax();
}
@ -152,10 +152,10 @@ static int omap_wdt_open(struct inode *inode, struct file *file)
}
/* initialize prescaler */
while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
cpu_relax();
omap_writel((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
while (omap_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
__raw_writel((1 << 5) | (PTV << 2), base + OMAP_WATCHDOG_CNTRL);
while (__raw_readl(base + OMAP_WATCHDOG_WPS) & 0x01)
cpu_relax();
file->private_data = (void *) wdev;
@ -224,7 +224,7 @@ static long omap_wdt_ioctl(struct file *file, unsigned int cmd,
return put_user(0, (int __user *)arg);
case WDIOC_GETBOOTSTATUS:
if (cpu_is_omap16xx())
return put_user(omap_readw(ARM_SYSST),
return put_user(__raw_readw(ARM_SYSST),
(int __user *)arg);
if (cpu_is_omap24xx())
return put_user(omap_prcm_get_reset_sources(),
@ -328,7 +328,12 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
goto fail;
}
}
wdev->base = (void __iomem *) (mem->start);
wdev->base = ioremap(res->start, res->end - res->start + 1);
if (!wdev->base) {
ret = -ENOMEM;
goto fail;
}
platform_set_drvdata(pdev, wdev);
omap_wdt_disable(wdev);
@ -344,11 +349,11 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
goto fail;
pr_info("OMAP Watchdog Timer Rev 0x%02x: initial timeout %d sec\n",
omap_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
__raw_readl(wdev->base + OMAP_WATCHDOG_REV) & 0xFF,
timer_margin);
/* autogate OCP interface clock */
omap_writel(0x01, wdev->base + OMAP_WATCHDOG_SYS_CONFIG);
__raw_writel(0x01, wdev->base + OMAP_WATCHDOG_SYS_CONFIG);
omap_wdt_dev = pdev;
@ -363,6 +368,7 @@ fail:
clk_put(wdev->mpu_wdt_ick);
if (wdev->mpu_wdt_fck)
clk_put(wdev->mpu_wdt_fck);
iounmap(wdev->base);
kfree(wdev);
}
if (mem) {
@ -404,6 +410,8 @@ static int omap_wdt_remove(struct platform_device *pdev)
clk_put(wdev->mpu_wdt_fck);
wdev->mpu_wdt_fck = NULL;
}
iounmap(wdev->base);
kfree(wdev);
omap_wdt_dev = NULL;
return 0;