3 files changed, 15 insertions, 13 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 48ca7132cc05..2785a0f16c9f 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -765,15 +765,15 @@ config RTC_DRV_AT32AP700X
           AT32AP700x family processors.
 
 config RTC_DRV_AT91RM9200
-        tristate "AT91RM9200 or AT91SAM9RL"
-        depends on ARCH_AT91RM9200 || ARCH_AT91SAM9RL
+        tristate "AT91RM9200 or some AT91SAM9 RTC"
+        depends on ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45
         help
           Driver for the internal RTC (Realtime Clock) module found on
-          Atmel AT91RM9200's and AT91SAM9RL chips. On SAM9RL chips
+          Atmel AT91RM9200's and some  AT91SAM9 chips. On AT91SAM9 chips
           this is powered by the backup power supply.
 
 config RTC_DRV_AT91SAM9
-        tristate "AT91SAM9x/AT91CAP9"
+        tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
         depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
         help
           RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
@@ -781,8 +781,8 @@ config RTC_DRV_AT91SAM9
           supply (such as a small coin cell battery), but do not need to
           be used as RTCs.
 
-          (On AT91SAM9rl chips you probably want to use the dedicated RTC
-          module and leave the RTT available for other uses.)
+          (On AT91SAM9rl and AT91SAM9G45 chips you probably want to use the
+          dedicated RTC module and leave the RTT available for other uses.)
 
 config RTC_DRV_AT91SAM9_RTT
         int
diff --git a/drivers/rtc/rtc-m41t80.c b/drivers/rtc/rtc-m41t80.c
index d60557cae8ef..5a8daa358066 100644
--- a/drivers/rtc/rtc-m41t80.c
+++ b/drivers/rtc/rtc-m41t80.c
@@ -20,7 +20,7 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/string.h>
 #ifdef CONFIG_RTC_DRV_M41T80_WDT
 #include <linux/fs.h>
@@ -68,6 +68,7 @@
 
 #define DRV_VERSION "0.05"
 
+static DEFINE_MUTEX(m41t80_rtc_mutex);
 static const struct i2c_device_id m41t80_id[] = {
         { "m41t62", M41T80_FEATURE_SQ | M41T80_FEATURE_SQ_ALT },
         { "m41t65", M41T80_FEATURE_HT | M41T80_FEATURE_WD },
@@ -677,9 +678,9 @@ static long wdt_unlocked_ioctl(struct file *file, unsigned int cmd,
 {
         int ret;
 
-        lock_kernel();
+        mutex_lock(&m41t80_rtc_mutex);
         ret = wdt_ioctl(file, cmd, arg);
-        unlock_kernel();
+        mutex_unlock(&m41t80_rtc_mutex);
 
         return ret;
 }
@@ -693,16 +694,16 @@ static long wdt_unlocked_ioctl(struct file *file, unsigned int cmd,
 static int wdt_open(struct inode *inode, struct file *file)
 {
         if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
-                lock_kernel();
+                mutex_lock(&m41t80_rtc_mutex);
                 if (test_and_set_bit(0, &wdt_is_open)) {
-                        unlock_kernel();
+                        mutex_unlock(&m41t80_rtc_mutex);
                         return -EBUSY;
                 }
                 /*
                  *      Activate
                  */
                 wdt_is_open = 1;
-                unlock_kernel();
+                mutex_unlock(&m41t80_rtc_mutex);
                 return nonseekable_open(inode, file);
         }
         return -ENODEV;
@@ -748,6 +749,7 @@ static const struct file_operations wdt_fops = {
         .write  = wdt_write,
         .open   = wdt_open,
         .release = wdt_release,
+        .llseek = no_llseek,
 };
 
 static struct miscdevice wdt_dev = {
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
index 62de66af0a68..ddb0857e15a4 100644
--- a/drivers/rtc/rtc-nuc900.c
+++ b/drivers/rtc/rtc-nuc900.c
@@ -274,7 +274,7 @@ static int __devinit nuc900_rtc_probe(struct platform_device *pdev)
         nuc900_rtc->rtcdev = rtc_device_register(pdev->name, &pdev->dev,
                                                 &nuc900_rtc_ops, THIS_MODULE);
         if (IS_ERR(nuc900_rtc->rtcdev)) {
-                dev_err(&pdev->dev, "rtc device register faild\n");
+                dev_err(&pdev->dev, "rtc device register failed\n");
                 err = PTR_ERR(nuc900_rtc->rtcdev);
                 goto fail3;
         }