1 files changed, 67 insertions, 44 deletions

diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index 3ff9e47bd218..bbb170e50055 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -25,6 +25,7 @@
 #include <linux/miscdevice.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/pm.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
@@ -55,14 +56,13 @@
 
 /**
  * struct sp805_wdt: sp805 wdt device structure
- *
- * lock: spin lock protecting dev structure and io access
- * base: base address of wdt
- * clk: clock structure of wdt
- * dev: amba device structure of wdt
- * status: current status of wdt
- * load_val: load value to be set for current timeout
- * timeout: current programmed timeout
+ * @lock: spin lock protecting dev structure and io access
+ * @base: base address of wdt
+ * @clk: clock structure of wdt
+ * @adev: amba device structure of wdt
+ * @status: current status of wdt
+ * @load_val: load value to be set for current timeout
+ * @timeout: current programmed timeout
  */
 struct sp805_wdt {
         spinlock_t                      lock;
@@ -78,7 +78,7 @@ struct sp805_wdt {
 
 /* local variables */
 static struct sp805_wdt *wdt;
-static int nowayout = WATCHDOG_NOWAYOUT;
+static bool nowayout = WATCHDOG_NOWAYOUT;
 
 /* This routine finds load value that will reset system in required timout */
 static void wdt_setload(unsigned int timeout)
@@ -113,10 +113,10 @@ static u32 wdt_timeleft(void)
         rate = clk_get_rate(wdt->clk);
 
         spin_lock(&wdt->lock);
-        load = readl(wdt->base + WDTVALUE);
+        load = readl_relaxed(wdt->base + WDTVALUE);
 
         /*If the interrupt is inactive then time left is WDTValue + WDTLoad. */
-        if (!(readl(wdt->base + WDTRIS) & INT_MASK))
+        if (!(readl_relaxed(wdt->base + WDTRIS) & INT_MASK))
                 load += wdt->load_val + 1;
         spin_unlock(&wdt->lock);
 
@@ -128,14 +128,14 @@ static void wdt_enable(void)
 {
         spin_lock(&wdt->lock);
 
-        writel(UNLOCK, wdt->base + WDTLOCK);
-        writel(wdt->load_val, wdt->base + WDTLOAD);
-        writel(INT_MASK, wdt->base + WDTINTCLR);
-        writel(INT_ENABLE | RESET_ENABLE, wdt->base + WDTCONTROL);
-        writel(LOCK, wdt->base + WDTLOCK);
+        writel_relaxed(UNLOCK, wdt->base + WDTLOCK);
+        writel_relaxed(wdt->load_val, wdt->base + WDTLOAD);
+        writel_relaxed(INT_MASK, wdt->base + WDTINTCLR);
+        writel_relaxed(INT_ENABLE | RESET_ENABLE, wdt->base + WDTCONTROL);
+        writel_relaxed(LOCK, wdt->base + WDTLOCK);
 
         /* Flush posted writes. */
-        readl(wdt->base + WDTLOCK);
+        readl_relaxed(wdt->base + WDTLOCK);
         spin_unlock(&wdt->lock);
 }
 
@@ -144,12 +144,12 @@ static void wdt_disable(void)
 {
         spin_lock(&wdt->lock);
 
-        writel(UNLOCK, wdt->base + WDTLOCK);
-        writel(0, wdt->base + WDTCONTROL);
-        writel(LOCK, wdt->base + WDTLOCK);
+        writel_relaxed(UNLOCK, wdt->base + WDTLOCK);
+        writel_relaxed(0, wdt->base + WDTCONTROL);
+        writel_relaxed(LOCK, wdt->base + WDTLOCK);
 
         /* Flush posted writes. */
-        readl(wdt->base + WDTLOCK);
+        readl_relaxed(wdt->base + WDTLOCK);
         spin_unlock(&wdt->lock);
 }
 
@@ -285,32 +285,33 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
 {
         int ret = 0;
 
-        if (!request_mem_region(adev->res.start, resource_size(&adev->res),
-                                "sp805_wdt")) {
+        if (!devm_request_mem_region(&adev->dev, adev->res.start,
+                                resource_size(&adev->res), "sp805_wdt")) {
                 dev_warn(&adev->dev, "Failed to get memory region resource\n");
                 ret = -ENOENT;
                 goto err;
         }
 
-        wdt = kzalloc(sizeof(*wdt), GFP_KERNEL);
+        wdt = devm_kzalloc(&adev->dev, sizeof(*wdt), GFP_KERNEL);
         if (!wdt) {
                 dev_warn(&adev->dev, "Kzalloc failed\n");
                 ret = -ENOMEM;
-                goto err_kzalloc;
+                goto err;
+        }
+
+        wdt->base = devm_ioremap(&adev->dev, adev->res.start,
+                        resource_size(&adev->res));
+        if (!wdt->base) {
+                ret = -ENOMEM;
+                dev_warn(&adev->dev, "ioremap fail\n");
+                goto err;
         }
 
         wdt->clk = clk_get(&adev->dev, NULL);
         if (IS_ERR(wdt->clk)) {
                 dev_warn(&adev->dev, "Clock not found\n");
                 ret = PTR_ERR(wdt->clk);
-                goto err_clk_get;
-        }
-
-        wdt->base = ioremap(adev->res.start, resource_size(&adev->res));
-        if (!wdt->base) {
-                ret = -ENOMEM;
-                dev_warn(&adev->dev, "ioremap fail\n");
-                goto err_ioremap;
+                goto err;
         }
 
         wdt->adev = adev;
@@ -327,14 +328,7 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)
         return 0;
 
 err_misc_register:
-        iounmap(wdt->base);
-err_ioremap:
         clk_put(wdt->clk);
-err_clk_get:
-        kfree(wdt);
-        wdt = NULL;
-err_kzalloc:
-        release_mem_region(adev->res.start, resource_size(&adev->res));
 err:
         dev_err(&adev->dev, "Probe Failed!!!\n");
         return ret;
@@ -343,14 +337,42 @@ err:
 static int __devexit sp805_wdt_remove(struct amba_device *adev)
 {
         misc_deregister(&sp805_wdt_miscdev);
-        iounmap(wdt->base);
         clk_put(wdt->clk);
-        kfree(wdt);
-        release_mem_region(adev->res.start, resource_size(&adev->res));
 
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int sp805_wdt_suspend(struct device *dev)
+{
+        if (test_bit(WDT_BUSY, &wdt->status)) {
+                wdt_disable();
+                clk_disable(wdt->clk);
+        }
+
+        return 0;
+}
+
+static int sp805_wdt_resume(struct device *dev)
+{
+        int ret = 0;
+
+        if (test_bit(WDT_BUSY, &wdt->status)) {
+                ret = clk_enable(wdt->clk);
+                if (ret) {
+                        dev_err(dev, "clock enable fail");
+                        return ret;
+                }
+                wdt_enable();
+        }
+
+        return ret;
+}
+#endif /* CONFIG_PM */
+
+static SIMPLE_DEV_PM_OPS(sp805_wdt_dev_pm_ops, sp805_wdt_suspend,
+                sp805_wdt_resume);
+
 static struct amba_id sp805_wdt_ids[] = {
         {
                 .id     = 0x00141805,
@@ -364,6 +386,7 @@ MODULE_DEVICE_TABLE(amba, sp805_wdt_ids);
 static struct amba_driver sp805_wdt_driver = {
         .drv = {
                 .name   = MODULE_NAME,
+                .pm     = &sp805_wdt_dev_pm_ops,
         },
         .id_table       = sp805_wdt_ids,
         .probe          = sp805_wdt_probe,
@@ -372,7 +395,7 @@ static struct amba_driver sp805_wdt_driver = {
 
 module_amba_driver(sp805_wdt_driver);
 
-module_param(nowayout, int, 0);
+module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
                 "Set to 1 to keep watchdog running after device release");