1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c
index 4eed51044c5d..82aad695979e 100644
--- a/drivers/rtc/rtc-imxdi.c
+++ b/drivers/rtc/rtc-imxdi.c
@@ -36,7 +36,9 @@
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
 #include <linux/sched.h>
+#include <linux/spinlock.h>
 #include <linux/workqueue.h>
+#include <linux/of.h>
 
 /* DryIce Register Definitions */
 
@@ -404,7 +406,7 @@ static int dryice_rtc_probe(struct platform_device *pdev)
 
         mutex_init(&imxdi->write_mutex);
 
-        imxdi->clk = clk_get(&pdev->dev, NULL);
+        imxdi->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(imxdi->clk))
                 return PTR_ERR(imxdi->clk);
         clk_prepare_enable(imxdi->clk);
@@ -473,12 +475,11 @@ static int dryice_rtc_probe(struct platform_device *pdev)
 
 err:
         clk_disable_unprepare(imxdi->clk);
-        clk_put(imxdi->clk);
 
         return rc;
 }
 
-static int __devexit dryice_rtc_remove(struct platform_device *pdev)
+static int dryice_rtc_remove(struct platform_device *pdev)
 {
         struct imxdi_dev *imxdi = platform_get_drvdata(pdev);
 
@@ -490,17 +491,26 @@ static int __devexit dryice_rtc_remove(struct platform_device *pdev)
         rtc_device_unregister(imxdi->rtc);
 
         clk_disable_unprepare(imxdi->clk);
-        clk_put(imxdi->clk);
 
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id dryice_dt_ids[] = {
+        { .compatible = "fsl,imx25-rtc" },
+        { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, dryice_dt_ids);
+#endif
+
 static struct platform_driver dryice_rtc_driver = {
         .driver = {
                    .name = "imxdi_rtc",
                    .owner = THIS_MODULE,
+                   .of_match_table = of_match_ptr(dryice_dt_ids),
                    },
-        .remove = __devexit_p(dryice_rtc_remove),
+        .remove = dryice_rtc_remove,
 };
 
 static int __init dryice_rtc_init(void)