1 files changed, 33 insertions, 2 deletions

diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
index 2fc31aac3f4..773adffac27 100644
--- a/drivers/rtc/rtc-tegra.c
+++ b/drivers/rtc/rtc-tegra.c
@@ -1,7 +1,8 @@
 /*
  * An RTC driver for the NVIDIA Tegra 200 series internal RTC.
  *
- * Copyright (c) 2010, NVIDIA Corporation.
+ * Copyright (c) 2010-2011, NVIDIA Corporation.
+ * Copyright (c) 2010 Jon Mayo <jmayo@nvidia.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -343,7 +344,7 @@ static int __devinit tegra_rtc_probe(struct platform_device *pdev)
 
         /* set context info. */
         info->pdev = pdev;
-        info->tegra_rtc_lock = __SPIN_LOCK_UNLOCKED(info->tegra_rtc_lock);
+        spin_lock_init(&info->tegra_rtc_lock);
 
         platform_set_drvdata(pdev, info);
 
@@ -376,6 +377,36 @@ static int __devinit tegra_rtc_probe(struct platform_device *pdev)
 
         dev_notice(&pdev->dev, "Tegra internal Real Time Clock\n");
 
+#ifndef CONFIG_TEGRA_SILICON_PLATFORM
+        {
+                struct rtc_time tm;
+
+                /* Get the current time from the RTC. */
+                ret = tegra_rtc_read_time(&pdev->dev, &tm);
+                if (ret) {
+                        /* Report but ignore this error. */
+                        dev_err(&pdev->dev,
+                                "Failed to get FPGA internal RTC time (err=%d)\n",
+                                ret);
+                } else if (tm.tm_year < 2010) {
+                        /* The RTC's default reset time is soooo last century. */
+                        tm.tm_year = 2010-1900;
+                        tm.tm_mon  = 0;
+                        tm.tm_mday = 1;
+                        tm.tm_hour = 0;
+                        tm.tm_min  = 0;
+                        tm.tm_sec  = 0;
+                        ret = tegra_rtc_set_time(&pdev->dev, &tm);
+                        if (ret) {
+                                /* Report but ignore this error. */
+                                dev_err(&pdev->dev,
+                                        "Failed to set FPGA internal RTC time (err=%d)\n",
+                                        ret);
+                        }
+                }
+        }
+#endif
+
         return 0;
 
 err_dev_unreg: