5 files changed, 29 insertions, 14 deletions

diff --git a/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt b/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt
new file mode 100644
index 000000000000..80a37193c0b8
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt
@@ -0,0 +1,10 @@
+Device tree bindings for twl4030-wdt driver (TWL4030 watchdog)
+
+Required properties:
+        compatible = "ti,twl4030-wdt";
+
+Example:
+
+watchdog {
+        compatible = "ti,twl4030-wdt";
+};
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 63411b036932..ed0bc9546837 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -19,6 +19,10 @@
                 interrupts = <11>;
         };
 
+        watchdog {
+                compatible = "ti,twl4030-wdt";
+        };
+
         vdac: regulator-vdac {
                 compatible = "ti,twl4030-vdac";
                 regulator-min-microvolt = <1800000>;
diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c
index 709ea1aefebb..f5ad10546fc9 100644
--- a/drivers/watchdog/da9055_wdt.c
+++ b/drivers/watchdog/da9055_wdt.c
@@ -72,20 +72,21 @@ static int da9055_wdt_set_timeout(struct watchdog_device *wdt_dev,
                                         DA9055_TWDSCALE_MASK,
                                         da9055_wdt_maps[i].reg_val <<
                                         DA9055_TWDSCALE_SHIFT);
-        if (ret < 0)
+        if (ret < 0) {
                 dev_err(da9055->dev,
                         "Failed to update timescale bit, %d\n", ret);
+                return ret;
+        }
 
         wdt_dev->timeout = timeout;
 
-        return ret;
+        return 0;
 }
 
 static int da9055_wdt_ping(struct watchdog_device *wdt_dev)
 {
         struct da9055_wdt_data *driver_data = watchdog_get_drvdata(wdt_dev);
         struct da9055 *da9055 = driver_data->da9055;
-        int ret;
 
         /*
          * We have a minimum time for watchdog window called TWDMIN. A write
@@ -94,18 +95,12 @@ static int da9055_wdt_ping(struct watchdog_device *wdt_dev)
         mdelay(DA9055_TWDMIN);
 
         /* Reset the watchdog timer */
-        ret = da9055_reg_update(da9055, DA9055_REG_CONTROL_E,
-                                DA9055_WATCHDOG_MASK, 1);
-
-        return ret;
+        return da9055_reg_update(da9055, DA9055_REG_CONTROL_E,
+                                 DA9055_WATCHDOG_MASK, 1);
 }
 
 static void da9055_wdt_release_resources(struct kref *r)
 {
-        struct da9055_wdt_data *driver_data =
-                container_of(r, struct da9055_wdt_data, kref);
-
-        kfree(driver_data);
 }
 
 static void da9055_wdt_ref(struct watchdog_device *wdt_dev)
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 34ed61ea02b4..b0e541d022e6 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -296,7 +296,6 @@ static int omap_wdt_remove(struct platform_device *pdev)
 {
         struct watchdog_device *wdog = platform_get_drvdata(pdev);
         struct omap_wdt_dev *wdev = watchdog_get_drvdata(wdog);
-        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
         pm_runtime_disable(wdev->dev);
         watchdog_unregister_device(wdog);
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index 81918cf8993b..0f03106f7516 100644
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -131,14 +131,21 @@ static int twl4030_wdt_resume(struct platform_device *pdev)
 #define twl4030_wdt_resume         NULL
 #endif
 
+static const struct of_device_id twl_wdt_of_match[] = {
+        { .compatible = "ti,twl4030-wdt", },
+        { },
+};
+MODULE_DEVICE_TABLE(of, twl_wdt_of_match);
+
 static struct platform_driver twl4030_wdt_driver = {
         .probe          = twl4030_wdt_probe,
         .remove         = twl4030_wdt_remove,
         .suspend        = twl4030_wdt_suspend,
         .resume         = twl4030_wdt_resume,
         .driver         = {
-                .owner  = THIS_MODULE,
-                .name   = "twl4030_wdt",
+                .owner          = THIS_MODULE,
+                .name           = "twl4030_wdt",
+                .of_match_table = twl_wdt_of_match,
         },
 };