Merge branch 'master' into upstream.

This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.

19 files changed, 748 insertions, 42 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 4941cade319f..e1878877399c 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -985,4 +985,14 @@ config RTC_DRV_LPC32XX
           This driver can also be buillt as a module. If so, the module
           will be called rtc-lpc32xx.
 
+config RTC_DRV_TEGRA
+        tristate "NVIDIA Tegra Internal RTC driver"
+        depends on RTC_CLASS && ARCH_TEGRA
+        help
+          If you say yes here you get support for the
+          Tegra 200 series internal RTC module.
+
+          This drive can also be built as a module. If so, the module
+          will be called rtc-tegra.
+
 endif # RTC_CLASS
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 2afdaf3ff986..ca91c3c42e98 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -2,9 +2,7 @@
 # Makefile for RTC class/drivers.
 #
 
-ifeq ($(CONFIG_RTC_DEBUG),y)
-        EXTRA_CFLAGS            += -DDEBUG
-endif
+ccflags-$(CONFIG_RTC_DEBUG)     := -DDEBUG
 
 obj-$(CONFIG_RTC_LIB)           += rtc-lib.o
 obj-$(CONFIG_RTC_HCTOSYS)       += hctosys.o
@@ -93,6 +91,7 @@ obj-$(CONFIG_RTC_DRV_STARFIRE)	+= rtc-starfire.o
 obj-$(CONFIG_RTC_DRV_STK17TA8)  += rtc-stk17ta8.o
 obj-$(CONFIG_RTC_DRV_STMP)      += rtc-stmp3xxx.o
 obj-$(CONFIG_RTC_DRV_SUN4V)     += rtc-sun4v.o
+obj-$(CONFIG_RTC_DRV_TEGRA)     += rtc-tegra.o
 obj-$(CONFIG_RTC_DRV_TEST)      += rtc-test.o
 obj-$(CONFIG_RTC_DRV_TWL4030)   += rtc-twl.o
 obj-$(CONFIG_RTC_DRV_TX4939)    += rtc-tx4939.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 09b4437b3e61..39013867cbd6 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -171,7 +171,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         err = __rtc_read_alarm(rtc, &alrm);
 
         if (!err && !rtc_valid_tm(&alrm.time))
-                rtc_set_alarm(rtc, &alrm);
+                rtc_initialize_alarm(rtc, &alrm);
 
         strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
         dev_set_name(&rtc->dev, "rtc%d", id);
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 8ec6b069a7f5..ef6316acec43 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -375,6 +375,32 @@ int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
 }
 EXPORT_SYMBOL_GPL(rtc_set_alarm);
 
+/* Called once per device from rtc_device_register */
+int rtc_initialize_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm)
+{
+        int err;
+
+        err = rtc_valid_tm(&alarm->time);
+        if (err != 0)
+                return err;
+
+        err = mutex_lock_interruptible(&rtc->ops_lock);
+        if (err)
+                return err;
+
+        rtc->aie_timer.node.expires = rtc_tm_to_ktime(alarm->time);
+        rtc->aie_timer.period = ktime_set(0, 0);
+        if (alarm->enabled) {
+                rtc->aie_timer.enabled = 1;
+                timerqueue_add(&rtc->timerqueue, &rtc->aie_timer.node);
+        }
+        mutex_unlock(&rtc->ops_lock);
+        return err;
+}
+EXPORT_SYMBOL_GPL(rtc_initialize_alarm);
+
+
+
 int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled)
 {
         int err = mutex_lock_interruptible(&rtc->ops_lock);
@@ -454,7 +480,7 @@ EXPORT_SYMBOL_GPL(rtc_update_irq_enable);
  * @rtc: pointer to the rtc device
  *
  * This function is called when an AIE, UIE or PIE mode interrupt
- * has occured (or been emulated).
+ * has occurred (or been emulated).
  *
  * Triggers the registered irq_task function callback.
  */
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 518a76ec71ca..e39b77a4609a 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -60,7 +60,7 @@ static void at91_rtc_decodetime(unsigned int timereg, unsigned int calreg,
         /*
          * The Calendar Alarm register does not have a field for
          * the year - so these will return an invalid value.  When an
-         * alarm is set, at91_alarm_year wille store the current year.
+         * alarm is set, at91_alarm_year will store the current year.
          */
         tm->tm_year  = bcd2bin(date & AT91_RTC_CENT) * 100;     /* century */
         tm->tm_year += bcd2bin((date & AT91_RTC_YEAR) >> 8);    /* year */
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index ca9cff85ab8a..90d866272c8e 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -20,9 +20,9 @@
  * write would be discarded and things quickly fall apart.
  *
  * To keep this delay from significantly degrading performance (we, in theory,
- * would have to sleep for up to 1 second everytime we wanted to write a
+ * would have to sleep for up to 1 second every time we wanted to write a
  * register), we only check the write pending status before we start to issue
- * a new write.  We bank on the idea that it doesnt matter when the sync
+ * a new write.  We bank on the idea that it doesn't matter when the sync
  * happens so long as we don't attempt another write before it does.  The only
  * time userspace would take this penalty is when they try and do multiple
  * operations right after another ... but in this case, they need to take the
@@ -250,6 +250,8 @@ static int bfin_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
                 bfin_rtc_int_set_alarm(rtc);
         else
                 bfin_rtc_int_clear(~(RTC_ISTAT_ALARM | RTC_ISTAT_ALARM_DAY));
+
+        return 0;
 }
 
 static int bfin_rtc_read_time(struct device *dev, struct rtc_time *tm)
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 316f484999b5..80f9c88214c5 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -220,6 +220,7 @@ static int __init coh901331_probe(struct platform_device *pdev)
         }
         clk_disable(rtap->clk);
 
+        platform_set_drvdata(pdev, rtap);
         rtap->rtc = rtc_device_register("coh901331", &pdev->dev, &coh901331_ops,
                                          THIS_MODULE);
         if (IS_ERR(rtap->rtc)) {
@@ -227,11 +228,10 @@ static int __init coh901331_probe(struct platform_device *pdev)
                 goto out_no_rtc;
         }
 
-        platform_set_drvdata(pdev, rtap);
-
         return 0;
 
  out_no_rtc:
+        platform_set_drvdata(pdev, NULL);
  out_no_clk_enable:
         clk_put(rtap->clk);
  out_no_clk:
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index d834a63ec4b0..e6e71deb188f 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -25,6 +25,7 @@
 #include <linux/bcd.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
+#include <linux/pm.h>
 
 #define DS1374_REG_TOD0         0x00 /* Time of Day */
 #define DS1374_REG_TOD1         0x01
@@ -409,32 +410,38 @@ static int __devexit ds1374_remove(struct i2c_client *client)
 }
 
 #ifdef CONFIG_PM
-static int ds1374_suspend(struct i2c_client *client, pm_message_t state)
+static int ds1374_suspend(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
+
         if (client->irq >= 0 && device_may_wakeup(&client->dev))
                 enable_irq_wake(client->irq);
         return 0;
 }
 
-static int ds1374_resume(struct i2c_client *client)
+static int ds1374_resume(struct device *dev)
 {
+        struct i2c_client *client = to_i2c_client(dev);
+
         if (client->irq >= 0 && device_may_wakeup(&client->dev))
                 disable_irq_wake(client->irq);
         return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(ds1374_pm, ds1374_suspend, ds1374_resume);
+
+#define DS1374_PM (&ds1374_pm)
 #else
-#define ds1374_suspend  NULL
-#define ds1374_resume   NULL
+#define DS1374_PM NULL
 #endif
 
 static struct i2c_driver ds1374_driver = {
         .driver = {
                 .name = "rtc-ds1374",
                 .owner = THIS_MODULE,
+                .pm = DS1374_PM,
         },
         .probe = ds1374_probe,
-        .suspend = ds1374_suspend,
-        .resume = ds1374_resume,
         .remove = __devexit_p(ds1374_remove),
         .id_table = ds1374_id,
 };
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index 3fffd708711f..fbabc773dded 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -468,7 +468,7 @@ ds1511_nvram_write(struct file *filp, struct kobject *kobj,
 static struct bin_attribute ds1511_nvram_attr = {
         .attr = {
                 .name = "nvram",
-                .mode = S_IRUGO | S_IWUGO,
+                .mode = S_IRUGO | S_IWUSR,
         },
         .size = DS1511_RAM_MAX,
         .read = ds1511_nvram_read,
diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index 468200c38ecb..da8beb8cae51 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -39,6 +39,8 @@
 #define ISL1208_REG_SR_BAT     (1<<1)   /* battery */
 #define ISL1208_REG_SR_RTCF    (1<<0)   /* rtc fail */
 #define ISL1208_REG_INT 0x08
+#define ISL1208_REG_INT_ALME   (1<<6)   /* alarm enable */
+#define ISL1208_REG_INT_IM     (1<<7)   /* interrupt/alarm mode */
 #define ISL1208_REG_09  0x09    /* reserved */
 #define ISL1208_REG_ATR 0x0a
 #define ISL1208_REG_DTR 0x0b
@@ -202,6 +204,30 @@ isl1208_i2c_set_usr(struct i2c_client *client, u16 usr)
 }
 
 static int
+isl1208_rtc_toggle_alarm(struct i2c_client *client, int enable)
+{
+        int icr = i2c_smbus_read_byte_data(client, ISL1208_REG_INT);
+
+        if (icr < 0) {
+                dev_err(&client->dev, "%s: reading INT failed\n", __func__);
+                return icr;
+        }
+
+        if (enable)
+                icr |= ISL1208_REG_INT_ALME | ISL1208_REG_INT_IM;
+        else
+                icr &= ~(ISL1208_REG_INT_ALME | ISL1208_REG_INT_IM);
+
+        icr = i2c_smbus_write_byte_data(client, ISL1208_REG_INT, icr);
+        if (icr < 0) {
+                dev_err(&client->dev, "%s: writing INT failed\n", __func__);
+                return icr;
+        }
+
+        return 0;
+}
+
+static int
 isl1208_rtc_proc(struct device *dev, struct seq_file *seq)
 {
         struct i2c_client *const client = to_i2c_client(dev);
@@ -288,9 +314,8 @@ isl1208_i2c_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm)
 {
         struct rtc_time *const tm = &alarm->time;
         u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
-        int sr;
+        int icr, yr, sr = isl1208_i2c_get_sr(client);
 
-        sr = isl1208_i2c_get_sr(client);
         if (sr < 0) {
                 dev_err(&client->dev, "%s: reading SR failed\n", __func__);
                 return sr;
@@ -313,6 +338,73 @@ isl1208_i2c_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm)
                 bcd2bin(regs[ISL1208_REG_MOA - ISL1208_REG_SCA] & 0x1f) - 1;
         tm->tm_wday = bcd2bin(regs[ISL1208_REG_DWA - ISL1208_REG_SCA] & 0x03);
 
+        /* The alarm doesn't store the year so get it from the rtc section */
+        yr = i2c_smbus_read_byte_data(client, ISL1208_REG_YR);
+        if (yr < 0) {
+                dev_err(&client->dev, "%s: reading RTC YR failed\n", __func__);
+                return yr;
+        }
+        tm->tm_year = bcd2bin(yr) + 100;
+
+        icr = i2c_smbus_read_byte_data(client, ISL1208_REG_INT);
+        if (icr < 0) {
+                dev_err(&client->dev, "%s: reading INT failed\n", __func__);
+                return icr;
+        }
+        alarm->enabled = !!(icr & ISL1208_REG_INT_ALME);
+
+        return 0;
+}
+
+static int
+isl1208_i2c_set_alarm(struct i2c_client *client, struct rtc_wkalrm *alarm)
+{
+        struct rtc_time *alarm_tm = &alarm->time;
+        u8 regs[ISL1208_ALARM_SECTION_LEN] = { 0, };
+        const int offs = ISL1208_REG_SCA;
+        unsigned long rtc_secs, alarm_secs;
+        struct rtc_time rtc_tm;
+        int err, enable;
+
+        err = isl1208_i2c_read_time(client, &rtc_tm);
+        if (err)
+                return err;
+        err = rtc_tm_to_time(&rtc_tm, &rtc_secs);
+        if (err)
+                return err;
+        err = rtc_tm_to_time(alarm_tm, &alarm_secs);
+        if (err)
+                return err;
+
+        /* If the alarm time is before the current time disable the alarm */
+        if (!alarm->enabled || alarm_secs <= rtc_secs)
+                enable = 0x00;
+        else
+                enable = 0x80;
+
+        /* Program the alarm and enable it for each setting */
+        regs[ISL1208_REG_SCA - offs] = bin2bcd(alarm_tm->tm_sec) | enable;
+        regs[ISL1208_REG_MNA - offs] = bin2bcd(alarm_tm->tm_min) | enable;
+        regs[ISL1208_REG_HRA - offs] = bin2bcd(alarm_tm->tm_hour) |
+                ISL1208_REG_HR_MIL | enable;
+
+        regs[ISL1208_REG_DTA - offs] = bin2bcd(alarm_tm->tm_mday) | enable;
+        regs[ISL1208_REG_MOA - offs] = bin2bcd(alarm_tm->tm_mon + 1) | enable;
+        regs[ISL1208_REG_DWA - offs] = bin2bcd(alarm_tm->tm_wday & 7) | enable;
+
+        /* write ALARM registers */
+        err = isl1208_i2c_set_regs(client, offs, regs,
+                                  ISL1208_ALARM_SECTION_LEN);
+        if (err < 0) {
+                dev_err(&client->dev, "%s: writing ALARM section failed\n",
+                        __func__);
+                return err;
+        }
+
+        err = isl1208_rtc_toggle_alarm(client, enable);
+        if (err)
+                return err;
+
         return 0;
 }
 
@@ -391,12 +483,63 @@ isl1208_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
         return isl1208_i2c_read_alarm(to_i2c_client(dev), alarm);
 }
 
+static int
+isl1208_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+        return isl1208_i2c_set_alarm(to_i2c_client(dev), alarm);
+}
+
+static irqreturn_t
+isl1208_rtc_interrupt(int irq, void *data)
+{
+        unsigned long timeout = jiffies + msecs_to_jiffies(1000);
+        struct i2c_client *client = data;
+        int handled = 0, sr, err;
+
+        /*
+         * I2C reads get NAK'ed if we read straight away after an interrupt?
+         * Using a mdelay/msleep didn't seem to help either, so we work around
+         * this by continually trying to read the register for a short time.
+         */
+        while (1) {
+                sr = isl1208_i2c_get_sr(client);
+                if (sr >= 0)
+                        break;
+
+                if (time_after(jiffies, timeout)) {
+                        dev_err(&client->dev, "%s: reading SR failed\n",
+                                __func__);
+                        return sr;
+                }
+        }
+
+        if (sr & ISL1208_REG_SR_ALM) {
+                dev_dbg(&client->dev, "alarm!\n");
+
+                /* Clear the alarm */
+                sr &= ~ISL1208_REG_SR_ALM;
+                sr = i2c_smbus_write_byte_data(client, ISL1208_REG_SR, sr);
+                if (sr < 0)
+                        dev_err(&client->dev, "%s: writing SR failed\n",
+                                __func__);
+                else
+                        handled = 1;
+
+                /* Disable the alarm */
+                err = isl1208_rtc_toggle_alarm(client, 0);
+                if (err)
+                        return err;
+        }
+
+        return handled ? IRQ_HANDLED : IRQ_NONE;
+}
+
 static const struct rtc_class_ops isl1208_rtc_ops = {
         .proc = isl1208_rtc_proc,
         .read_time = isl1208_rtc_read_time,
         .set_time = isl1208_rtc_set_time,
         .read_alarm = isl1208_rtc_read_alarm,
-        /*.set_alarm    = isl1208_rtc_set_alarm, */
+        .set_alarm = isl1208_rtc_set_alarm,
 };
 
 /* sysfs interface */
@@ -488,11 +631,29 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
         dev_info(&client->dev,
                  "chip found, driver version " DRV_VERSION "\n");
 
+        if (client->irq > 0) {
+                rc = request_threaded_irq(client->irq, NULL,
+                                          isl1208_rtc_interrupt,
+                                          IRQF_SHARED,
+                                          isl1208_driver.driver.name, client);
+                if (!rc) {
+                        device_init_wakeup(&client->dev, 1);
+                        enable_irq_wake(client->irq);
+                } else {
+                        dev_err(&client->dev,
+                                "Unable to request irq %d, no alarm support\n",
+                                client->irq);
+                        client->irq = 0;
+                }
+        }
+
         rtc = rtc_device_register(isl1208_driver.driver.name,
                                   &client->dev, &isl1208_rtc_ops,
                                   THIS_MODULE);
-        if (IS_ERR(rtc))
-                return PTR_ERR(rtc);
+        if (IS_ERR(rtc)) {
+                rc = PTR_ERR(rtc);
+                goto exit_free_irq;
+        }
 
         i2c_set_clientdata(client, rtc);
 
@@ -514,6 +675,9 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
 exit_unregister:
         rtc_device_unregister(rtc);
+exit_free_irq:
+        if (client->irq)
+                free_irq(client->irq, client);
 
         return rc;
 }
@@ -525,6 +689,8 @@ isl1208_remove(struct i2c_client *client)
 
         sysfs_remove_group(&client->dev.kobj, &isl1208_rtc_sysfs_files);
         rtc_device_unregister(rtc);
+        if (client->irq)
+                free_irq(client->irq, client);
 
         return 0;
 }
diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c
index ec8701ce99f9..ae16250c762f 100644
--- a/drivers/rtc/rtc-lpc32xx.c
+++ b/drivers/rtc/rtc-lpc32xx.c
@@ -240,7 +240,7 @@ static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev)
         spin_lock_init(&rtc->lock);
 
         /*
-         * The RTC is on a seperate power domain and can keep it's state
+         * The RTC is on a separate power domain and can keep it's state
          * across a chip power cycle. If the RTC has never been previously
          * setup, then set it up now for the first time.
          */
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 174036dda786..20494b5edc3c 100644
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -257,6 +257,8 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
                 goto out_irq;
         }
 
+        dev_set_drvdata(&pdev->dev, info);
+
         info->rtc_dev = rtc_device_register("max8925-rtc", &pdev->dev,
                                         &max8925_rtc_ops, THIS_MODULE);
         ret = PTR_ERR(info->rtc_dev);
@@ -265,7 +267,6 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
                 goto out_rtc;
         }
 
-        dev_set_drvdata(&pdev->dev, info);
         platform_set_drvdata(pdev, info);
 
         return 0;
diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index c42006469559..c5ac03793e79 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -401,6 +401,7 @@ const struct platform_device_id mc13xxx_rtc_idtable[] = {
         }, {
                 .name = "mc13892-rtc",
         },
+        { }
 };
 
 static struct platform_driver mc13xxx_rtc_driver = {
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index b86bc328463b..b2f096871a97 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -319,7 +319,7 @@ static irqreturn_t mrst_rtc_irq(int irq, void *p)
         return IRQ_NONE;
 }
 
-static int __init
+static int __devinit
 vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
 {
         int retval = 0;
@@ -342,6 +342,8 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
 
         mrst_rtc.irq = rtc_irq;
         mrst_rtc.iomem = iomem;
+        mrst_rtc.dev = dev;
+        dev_set_drvdata(dev, &mrst_rtc);
 
         mrst_rtc.rtc = rtc_device_register(driver_name, dev,
                                 &mrst_rtc_ops, THIS_MODULE);
@@ -350,8 +352,6 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
                 goto cleanup0;
         }
 
-        mrst_rtc.dev = dev;
-        dev_set_drvdata(dev, &mrst_rtc);
         rename_region(iomem, dev_name(&mrst_rtc.rtc->dev));
 
         spin_lock_irq(&rtc_lock);
@@ -376,9 +376,10 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
         return 0;
 
 cleanup1:
-        mrst_rtc.dev = NULL;
         rtc_device_unregister(mrst_rtc.rtc);
 cleanup0:
+        dev_set_drvdata(dev, NULL);
+        mrst_rtc.dev = NULL;
         release_region(iomem->start, iomem->end + 1 - iomem->start);
         dev_err(dev, "rtc-mrst: unable to initialise\n");
         return retval;
@@ -391,7 +392,7 @@ static void rtc_mrst_do_shutdown(void)
         spin_unlock_irq(&rtc_lock);
 }
 
-static void __exit rtc_mrst_do_remove(struct device *dev)
+static void __devexit rtc_mrst_do_remove(struct device *dev)
 {
         struct mrst_rtc *mrst = dev_get_drvdata(dev);
         struct resource *iomem;
@@ -500,14 +501,14 @@ static inline int mrst_poweroff(struct device *dev)
 
 #endif
 
-static int __init vrtc_mrst_platform_probe(struct platform_device *pdev)
+static int __devinit vrtc_mrst_platform_probe(struct platform_device *pdev)
 {
         return vrtc_mrst_do_probe(&pdev->dev,
                         platform_get_resource(pdev, IORESOURCE_MEM, 0),
                         platform_get_irq(pdev, 0));
 }
 
-static int __exit vrtc_mrst_platform_remove(struct platform_device *pdev)
+static int __devexit vrtc_mrst_platform_remove(struct platform_device *pdev)
 {
         rtc_mrst_do_remove(&pdev->dev);
         return 0;
@@ -525,7 +526,7 @@ MODULE_ALIAS("platform:vrtc_mrst");
 
 static struct platform_driver vrtc_mrst_platform_driver = {
         .probe          = vrtc_mrst_platform_probe,
-        .remove         = __exit_p(vrtc_mrst_platform_remove),
+        .remove         = __devexit_p(vrtc_mrst_platform_remove),
         .shutdown       = vrtc_mrst_platform_shutdown,
         .driver = {
                 .name           = (char *) driver_name,
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index de0dd7b1f146..bcae8dd41496 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -394,7 +394,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
         return 0;
 
 fail2:
-        free_irq(omap_rtc_timer, NULL);
+        free_irq(omap_rtc_timer, rtc);
 fail1:
         rtc_device_unregister(rtc);
 fail0:
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 714964913e5e..16512ecae31a 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -46,6 +46,7 @@ static struct clk *rtc_clk;
 static void __iomem *s3c_rtc_base;
 static int s3c_rtc_alarmno = NO_IRQ;
 static int s3c_rtc_tickno  = NO_IRQ;
+static bool wake_en;
 static enum s3c_cpu_type s3c_rtc_cpu_type;
 
 static DEFINE_SPINLOCK(s3c_rtc_pie_lock);
@@ -336,7 +337,6 @@ static void s3c_rtc_release(struct device *dev)
 
         /* do not clear AIE here, it may be needed for wake */
 
-        s3c_rtc_setpie(dev, 0);
         free_irq(s3c_rtc_alarmno, rtc_dev);
         free_irq(s3c_rtc_tickno, rtc_dev);
 }
@@ -408,7 +408,6 @@ static int __devexit s3c_rtc_remove(struct platform_device *dev)
         platform_set_drvdata(dev, NULL);
         rtc_device_unregister(rtc);
 
-        s3c_rtc_setpie(&dev->dev, 0);
         s3c_rtc_setaie(&dev->dev, 0);
 
         clk_disable(rtc_clk);
@@ -564,8 +563,12 @@ static int s3c_rtc_suspend(struct platform_device *pdev, pm_message_t state)
         }
         s3c_rtc_enable(pdev, 0);
 
-        if (device_may_wakeup(&pdev->dev))
-                enable_irq_wake(s3c_rtc_alarmno);
+        if (device_may_wakeup(&pdev->dev) && !wake_en) {
+                if (enable_irq_wake(s3c_rtc_alarmno) == 0)
+                        wake_en = true;
+                else
+                        dev_err(&pdev->dev, "enable_irq_wake failed\n");
+        }
 
         return 0;
 }
@@ -581,8 +584,10 @@ static int s3c_rtc_resume(struct platform_device *pdev)
                 writew(tmp | ticnt_en_save, s3c_rtc_base + S3C2410_RTCCON);
         }
 
-        if (device_may_wakeup(&pdev->dev))
+        if (device_may_wakeup(&pdev->dev) && wake_en) {
                 disable_irq_wake(s3c_rtc_alarmno);
+                wake_en = false;
+        }
 
         return 0;
 }
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index e55dc1ac83ab..6ac55fd48413 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -782,11 +782,11 @@ static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
         struct platform_device *pdev = to_platform_device(dev);
         struct sh_rtc *rtc = platform_get_drvdata(pdev);
 
-        set_irq_wake(rtc->periodic_irq, enabled);
+        irq_set_irq_wake(rtc->periodic_irq, enabled);
 
         if (rtc->carry_irq > 0) {
-                set_irq_wake(rtc->carry_irq, enabled);
-                set_irq_wake(rtc->alarm_irq, enabled);
+                irq_set_irq_wake(rtc->carry_irq, enabled);
+                irq_set_irq_wake(rtc->alarm_irq, enabled);
         }
 }
 
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c
new file mode 100644
index 000000000000..2fc31aac3f4e
--- /dev/null
+++ b/drivers/rtc/rtc-tegra.c
@@ -0,0 +1,488 @@
+/*
+ * An RTC driver for the NVIDIA Tegra 200 series internal RTC.
+ *
+ * Copyright (c) 2010, NVIDIA Corporation.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <linux/delay.h>
+#include <linux/rtc.h>
+#include <linux/platform_device.h>
+
+/* set to 1 = busy every eight 32kHz clocks during copy of sec+msec to AHB */
+#define TEGRA_RTC_REG_BUSY                      0x004
+#define TEGRA_RTC_REG_SECONDS                   0x008
+/* when msec is read, the seconds are buffered into shadow seconds. */
+#define TEGRA_RTC_REG_SHADOW_SECONDS            0x00c
+#define TEGRA_RTC_REG_MILLI_SECONDS             0x010
+#define TEGRA_RTC_REG_SECONDS_ALARM0            0x014
+#define TEGRA_RTC_REG_SECONDS_ALARM1            0x018
+#define TEGRA_RTC_REG_MILLI_SECONDS_ALARM0      0x01c
+#define TEGRA_RTC_REG_INTR_MASK                 0x028
+/* write 1 bits to clear status bits */
+#define TEGRA_RTC_REG_INTR_STATUS               0x02c
+
+/* bits in INTR_MASK */
+#define TEGRA_RTC_INTR_MASK_MSEC_CDN_ALARM      (1<<4)
+#define TEGRA_RTC_INTR_MASK_SEC_CDN_ALARM       (1<<3)
+#define TEGRA_RTC_INTR_MASK_MSEC_ALARM          (1<<2)
+#define TEGRA_RTC_INTR_MASK_SEC_ALARM1          (1<<1)
+#define TEGRA_RTC_INTR_MASK_SEC_ALARM0          (1<<0)
+
+/* bits in INTR_STATUS */
+#define TEGRA_RTC_INTR_STATUS_MSEC_CDN_ALARM    (1<<4)
+#define TEGRA_RTC_INTR_STATUS_SEC_CDN_ALARM     (1<<3)
+#define TEGRA_RTC_INTR_STATUS_MSEC_ALARM        (1<<2)
+#define TEGRA_RTC_INTR_STATUS_SEC_ALARM1        (1<<1)
+#define TEGRA_RTC_INTR_STATUS_SEC_ALARM0        (1<<0)
+
+struct tegra_rtc_info {
+        struct platform_device  *pdev;
+        struct rtc_device       *rtc_dev;
+        void __iomem            *rtc_base; /* NULL if not initialized. */
+        int                     tegra_rtc_irq; /* alarm and periodic irq */
+        spinlock_t              tegra_rtc_lock;
+};
+
+/* RTC hardware is busy when it is updating its values over AHB once
+ * every eight 32kHz clocks (~250uS).
+ * outside of these updates the CPU is free to write.
+ * CPU is always free to read.
+ */
+static inline u32 tegra_rtc_check_busy(struct tegra_rtc_info *info)
+{
+        return readl(info->rtc_base + TEGRA_RTC_REG_BUSY) & 1;
+}
+
+/* Wait for hardware to be ready for writing.
+ * This function tries to maximize the amount of time before the next update.
+ * It does this by waiting for the RTC to become busy with its periodic update,
+ * then returning once the RTC first becomes not busy.
+ * This periodic update (where the seconds and milliseconds are copied to the
+ * AHB side) occurs every eight 32kHz clocks (~250uS).
+ * The behavior of this function allows us to make some assumptions without
+ * introducing a race, because 250uS is plenty of time to read/write a value.
+ */
+static int tegra_rtc_wait_while_busy(struct device *dev)
+{
+        struct tegra_rtc_info *info = dev_get_drvdata(dev);
+
+        int retries = 500; /* ~490 us is the worst case, ~250 us is best. */
+
+        /* first wait for the RTC to become busy. this is when it
+         * posts its updated seconds+msec registers to AHB side. */
+        while (tegra_rtc_check_busy(info)) {
+                if (!retries--)
+                        goto retry_failed;
+                udelay(1);
+        }
+
+        /* now we have about 250 us to manipulate registers */
+        return 0;
+
+retry_failed:
+        dev_err(dev, "write failed:retry count exceeded.\n");
+        return -ETIMEDOUT;
+}
+
+static int tegra_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct tegra_rtc_info *info = dev_get_drvdata(dev);
+        unsigned long sec, msec;
+        unsigned long sl_irq_flags;
+
+        /* RTC hardware copies seconds to shadow seconds when a read
+         * of milliseconds occurs. use a lock to keep other threads out. */
+        spin_lock_irqsave(&info->tegra_rtc_lock, sl_irq_flags);
+
+        msec = readl(info->rtc_base + TEGRA_RTC_REG_MILLI_SECONDS);
+        sec = readl(info->rtc_base + TEGRA_RTC_REG_SHADOW_SECONDS);
+
+        spin_unlock_irqrestore(&info->tegra_rtc_lock, sl_irq_flags);
+
+        rtc_time_to_tm(sec, tm);
+
+        dev_vdbg(dev, "time read as %lu. %d/%d/%d %d:%02u:%02u\n",
+                sec,
+                tm->tm_mon + 1,
+                tm->tm_mday,
+                tm->tm_year + 1900,
+                tm->tm_hour,
+                tm->tm_min,
+                tm->tm_sec
+        );
+
+        return 0;
+}
+
+static int tegra_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct tegra_rtc_info *info = dev_get_drvdata(dev);
+        unsigned long sec;
+        int ret;
+
+        /* convert tm to seconds. */
+        ret = rtc_valid_tm(tm);
+        if (ret)
+                return ret;
+
+        rtc_tm_to_time(tm, &sec);
+
+        dev_vdbg(dev, "time set to %lu. %d/%d/%d %d:%02u:%02u\n",
+                sec,
+                tm->tm_mon+1,
+                tm->tm_mday,
+                tm->tm_year+1900,
+                tm->tm_hour,
+                tm->tm_min,
+                tm->tm_sec
+        );
+
+        /* seconds only written if wait succeeded. */
+        ret = tegra_rtc_wait_while_busy(dev);
+        if (!ret)
+                writel(sec, info->rtc_base + TEGRA_RTC_REG_SECONDS);
+
+        dev_vdbg(dev, "time read back as %d\n",
+                readl(info->rtc_base + TEGRA_RTC_REG_SECONDS));
+
+        return ret;
+}
+
+static int tegra_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+        struct tegra_rtc_info *info = dev_get_drvdata(dev);
+        unsigned long sec;
+        unsigned tmp;
+
+        sec = readl(info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0);
+
+        if (sec == 0) {
+                /* alarm is disabled. */
+                alarm->enabled = 0;
+                alarm->time.tm_mon = -1;
+                alarm->time.tm_mday = -1;
+                alarm->time.tm_year = -1;
+                alarm->time.tm_hour = -1;
+                alarm->time.tm_min = -1;
+                alarm->time.tm_sec = -1;
+        } else {
+                /* alarm is enabled. */
+                alarm->enabled = 1;
+                rtc_time_to_tm(sec, &alarm->time);
+        }
+
+        tmp = readl(info->rtc_base + TEGRA_RTC_REG_INTR_STATUS);
+        alarm->pending = (tmp & TEGRA_RTC_INTR_STATUS_SEC_ALARM0) != 0;
+
+        return 0;
+}
+
+static int tegra_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct tegra_rtc_info *info = dev_get_drvdata(dev);
+        unsigned status;
+        unsigned long sl_irq_flags;
+
+        tegra_rtc_wait_while_busy(dev);
+        spin_lock_irqsave(&info->tegra_rtc_lock, sl_irq_flags);
+
+        /* read the original value, and OR in the flag. */
+        status = readl(info->rtc_base + TEGRA_RTC_REG_INTR_MASK);
+        if (enabled)
+                status |= TEGRA_RTC_INTR_MASK_SEC_ALARM0; /* set it */
+        else
+                status &= ~TEGRA_RTC_INTR_MASK_SEC_ALARM0; /* clear it */
+
+        writel(status, info->rtc_base + TEGRA_RTC_REG_INTR_MASK);
+
+        spin_unlock_irqrestore(&info->tegra_rtc_lock, sl_irq_flags);
+
+        return 0;
+}
+
+static int tegra_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
+{
+        struct tegra_rtc_info *info = dev_get_drvdata(dev);
+        unsigned long sec;
+
+        if (alarm->enabled)
+                rtc_tm_to_time(&alarm->time, &sec);
+        else
+                sec = 0;
+
+        tegra_rtc_wait_while_busy(dev);
+        writel(sec, info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0);
+        dev_vdbg(dev, "alarm read back as %d\n",
+                readl(info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0));
+
+        /* if successfully written and alarm is enabled ... */
+        if (sec) {
+                tegra_rtc_alarm_irq_enable(dev, 1);
+
+                dev_vdbg(dev, "alarm set as %lu. %d/%d/%d %d:%02u:%02u\n",
+                        sec,
+                        alarm->time.tm_mon+1,
+                        alarm->time.tm_mday,
+                        alarm->time.tm_year+1900,
+                        alarm->time.tm_hour,
+                        alarm->time.tm_min,
+                        alarm->time.tm_sec);
+        } else {
+                /* disable alarm if 0 or write error. */
+                dev_vdbg(dev, "alarm disabled\n");
+                tegra_rtc_alarm_irq_enable(dev, 0);
+        }
+
+        return 0;
+}
+
+static int tegra_rtc_proc(struct device *dev, struct seq_file *seq)
+{
+        if (!dev || !dev->driver)
+                return 0;
+
+        return seq_printf(seq, "name\t\t: %s\n", dev_name(dev));
+}
+
+static irqreturn_t tegra_rtc_irq_handler(int irq, void *data)
+{
+        struct device *dev = data;
+        struct tegra_rtc_info *info = dev_get_drvdata(dev);
+        unsigned long events = 0;
+        unsigned status;
+        unsigned long sl_irq_flags;
+
+        status = readl(info->rtc_base + TEGRA_RTC_REG_INTR_STATUS);
+        if (status) {
+                /* clear the interrupt masks and status on any irq. */
+                tegra_rtc_wait_while_busy(dev);
+                spin_lock_irqsave(&info->tegra_rtc_lock, sl_irq_flags);
+                writel(0, info->rtc_base + TEGRA_RTC_REG_INTR_MASK);
+                writel(status, info->rtc_base + TEGRA_RTC_REG_INTR_STATUS);
+                spin_unlock_irqrestore(&info->tegra_rtc_lock, sl_irq_flags);
+        }
+
+        /* check if Alarm */
+        if ((status & TEGRA_RTC_INTR_STATUS_SEC_ALARM0))
+                events |= RTC_IRQF | RTC_AF;
+
+        /* check if Periodic */
+        if ((status & TEGRA_RTC_INTR_STATUS_SEC_CDN_ALARM))
+                events |= RTC_IRQF | RTC_PF;
+
+        rtc_update_irq(info->rtc_dev, 1, events);
+
+        return IRQ_HANDLED;
+}
+
+static struct rtc_class_ops tegra_rtc_ops = {
+        .read_time      = tegra_rtc_read_time,
+        .set_time       = tegra_rtc_set_time,
+        .read_alarm     = tegra_rtc_read_alarm,
+        .set_alarm      = tegra_rtc_set_alarm,
+        .proc           = tegra_rtc_proc,
+        .alarm_irq_enable = tegra_rtc_alarm_irq_enable,
+};
+
+static int __devinit tegra_rtc_probe(struct platform_device *pdev)
+{
+        struct tegra_rtc_info *info;
+        struct resource *res;
+        int ret;
+
+        info = kzalloc(sizeof(struct tegra_rtc_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev,
+                        "Unable to allocate resources for device.\n");
+                ret = -EBUSY;
+                goto err_free_info;
+        }
+
+        if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
+                dev_err(&pdev->dev,
+                        "Unable to request mem region for device.\n");
+                ret = -EBUSY;
+                goto err_free_info;
+        }
+
+        info->tegra_rtc_irq = platform_get_irq(pdev, 0);
+        if (info->tegra_rtc_irq <= 0) {
+                ret = -EBUSY;
+                goto err_release_mem_region;
+        }
+
+        info->rtc_base = ioremap_nocache(res->start, resource_size(res));
+        if (!info->rtc_base) {
+                dev_err(&pdev->dev, "Unable to grab IOs for device.\n");
+                ret = -EBUSY;
+                goto err_release_mem_region;
+        }
+
+        /* set context info. */
+        info->pdev = pdev;
+        info->tegra_rtc_lock = __SPIN_LOCK_UNLOCKED(info->tegra_rtc_lock);
+
+        platform_set_drvdata(pdev, info);
+
+        /* clear out the hardware. */
+        writel(0, info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0);
+        writel(0xffffffff, info->rtc_base + TEGRA_RTC_REG_INTR_STATUS);
+        writel(0, info->rtc_base + TEGRA_RTC_REG_INTR_MASK);
+
+        device_init_wakeup(&pdev->dev, 1);
+
+        info->rtc_dev = rtc_device_register(
+                pdev->name, &pdev->dev, &tegra_rtc_ops, THIS_MODULE);
+        if (IS_ERR(info->rtc_dev)) {
+                ret = PTR_ERR(info->rtc_dev);
+                info->rtc_dev = NULL;
+                dev_err(&pdev->dev,
+                        "Unable to register device (err=%d).\n",
+                        ret);
+                goto err_iounmap;
+        }
+
+        ret = request_irq(info->tegra_rtc_irq, tegra_rtc_irq_handler,
+                IRQF_TRIGGER_HIGH, "rtc alarm", &pdev->dev);
+        if (ret) {
+                dev_err(&pdev->dev,
+                        "Unable to request interrupt for device (err=%d).\n",
+                        ret);
+                goto err_dev_unreg;
+        }
+
+        dev_notice(&pdev->dev, "Tegra internal Real Time Clock\n");
+
+        return 0;
+
+err_dev_unreg:
+        rtc_device_unregister(info->rtc_dev);
+err_iounmap:
+        iounmap(info->rtc_base);
+err_release_mem_region:
+        release_mem_region(res->start, resource_size(res));
+err_free_info:
+        kfree(info);
+
+        return ret;
+}
+
+static int __devexit tegra_rtc_remove(struct platform_device *pdev)
+{
+        struct tegra_rtc_info *info = platform_get_drvdata(pdev);
+        struct resource *res;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -EBUSY;
+
+        free_irq(info->tegra_rtc_irq, &pdev->dev);
+        rtc_device_unregister(info->rtc_dev);
+        iounmap(info->rtc_base);
+        release_mem_region(res->start, resource_size(res));
+        kfree(info);
+
+        platform_set_drvdata(pdev, NULL);
+
+        return 0;
+}
+
+#ifdef CONFIG_PM
+static int tegra_rtc_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct device *dev = &pdev->dev;
+        struct tegra_rtc_info *info = platform_get_drvdata(pdev);
+
+        tegra_rtc_wait_while_busy(dev);
+
+        /* only use ALARM0 as a wake source. */
+        writel(0xffffffff, info->rtc_base + TEGRA_RTC_REG_INTR_STATUS);
+        writel(TEGRA_RTC_INTR_STATUS_SEC_ALARM0,
+                info->rtc_base + TEGRA_RTC_REG_INTR_MASK);
+
+        dev_vdbg(dev, "alarm sec = %d\n",
+                readl(info->rtc_base + TEGRA_RTC_REG_SECONDS_ALARM0));
+
+        dev_vdbg(dev, "Suspend (device_may_wakeup=%d) irq:%d\n",
+                device_may_wakeup(dev), info->tegra_rtc_irq);
+
+        /* leave the alarms on as a wake source. */
+        if (device_may_wakeup(dev))
+                enable_irq_wake(info->tegra_rtc_irq);
+
+        return 0;
+}
+
+static int tegra_rtc_resume(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct tegra_rtc_info *info = platform_get_drvdata(pdev);
+
+        dev_vdbg(dev, "Resume (device_may_wakeup=%d)\n",
+                device_may_wakeup(dev));
+        /* alarms were left on as a wake source, turn them off. */
+        if (device_may_wakeup(dev))
+                disable_irq_wake(info->tegra_rtc_irq);
+
+        return 0;
+}
+#endif
+
+static void tegra_rtc_shutdown(struct platform_device *pdev)
+{
+        dev_vdbg(&pdev->dev, "disabling interrupts.\n");
+        tegra_rtc_alarm_irq_enable(&pdev->dev, 0);
+}
+
+MODULE_ALIAS("platform:tegra_rtc");
+static struct platform_driver tegra_rtc_driver = {
+        .remove         = __devexit_p(tegra_rtc_remove),
+        .shutdown       = tegra_rtc_shutdown,
+        .driver         = {
+                .name   = "tegra_rtc",
+                .owner  = THIS_MODULE,
+        },
+#ifdef CONFIG_PM
+        .suspend        = tegra_rtc_suspend,
+        .resume         = tegra_rtc_resume,
+#endif
+};
+
+static int __init tegra_rtc_init(void)
+{
+        return platform_driver_probe(&tegra_rtc_driver, tegra_rtc_probe);
+}
+module_init(tegra_rtc_init);
+
+static void __exit tegra_rtc_exit(void)
+{
+        platform_driver_unregister(&tegra_rtc_driver);
+}
+module_exit(tegra_rtc_exit);
+
+MODULE_AUTHOR("Jon Mayo <jmayo@nvidia.com>");
+MODULE_DESCRIPTION("driver for Tegra internal RTC");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c
index 9aae49139a0a..b00aad2620d4 100644
--- a/drivers/rtc/rtc-x1205.c
+++ b/drivers/rtc/rtc-x1205.c
@@ -573,7 +573,7 @@ static int x1205_probe(struct i2c_client *client,
 
         i2c_set_clientdata(client, rtc);
 
-        /* Check for power failures and eventualy enable the osc */
+        /* Check for power failures and eventually enable the osc */
         if ((err = x1205_get_status(client, &sr)) == 0) {
                 if (sr & X1205_SR_RTCF) {
                         dev_err(&client->dev,