Patched in Tegra support.

1 files changed, 5 insertions, 19 deletions

diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c
index 75d307ab37f..d93a9608b1f 100644
--- a/drivers/rtc/rtc-imxdi.c
+++ b/drivers/rtc/rtc-imxdi.c
@@ -36,9 +36,7 @@
 #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 */
 
@@ -394,8 +392,6 @@ static int dryice_rtc_probe(struct platform_device *pdev)
         if (imxdi->ioaddr == NULL)
                 return -ENOMEM;
 
-        spin_lock_init(&imxdi->irq_lock);
-
         imxdi->irq = platform_get_irq(pdev, 0);
         if (imxdi->irq < 0)
                 return imxdi->irq;
@@ -409,7 +405,7 @@ static int dryice_rtc_probe(struct platform_device *pdev)
         imxdi->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(imxdi->clk))
                 return PTR_ERR(imxdi->clk);
-        clk_prepare_enable(imxdi->clk);
+        clk_enable(imxdi->clk);
 
         /*
          * Initialize dryice hardware
@@ -474,13 +470,13 @@ static int dryice_rtc_probe(struct platform_device *pdev)
         return 0;
 
 err:
-        clk_disable_unprepare(imxdi->clk);
+        clk_disable(imxdi->clk);
         clk_put(imxdi->clk);
 
         return rc;
 }
 
-static int dryice_rtc_remove(struct platform_device *pdev)
+static int __devexit dryice_rtc_remove(struct platform_device *pdev)
 {
         struct imxdi_dev *imxdi = platform_get_drvdata(pdev);
 
@@ -491,28 +487,18 @@ static int dryice_rtc_remove(struct platform_device *pdev)
 
         rtc_device_unregister(imxdi->rtc);
 
-        clk_disable_unprepare(imxdi->clk);
+        clk_disable(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 = dryice_rtc_remove,
+        .remove = __devexit_p(dryice_rtc_remove),
 };
 
 static int __init dryice_rtc_init(void)