Merge branch 'akpm' (incoming from Andrew)

Merge second patch-bomb from Andrew Morton:
 - various misc bits
 - the rest of MM
 - add generic fixmap.h, use it
 - backlight updates
 - dynamic_debug updates
 - printk() updates
 - checkpatch updates
 - binfmt_elf
 - ramfs
 - init/
 - autofs4
 - drivers/rtc
 - nilfs
 - hfsplus
 - Documentation/
 - coredump
 - procfs
 - fork
 - exec
 - kexec
 - kdump
 - partitions
 - rapidio
 - rbtree
 - userns
 - memstick
 - w1
 - decompressors

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (197 commits)
  lib/decompress_unlz4.c: always set an error return code on failures
  romfs: fix returm err while getting inode in fill_super
  drivers/w1/masters/w1-gpio.c: add strong pullup emulation
  drivers/memstick/host/rtsx_pci_ms.c: fix ms card data transfer bug
  userns: relax the posix_acl_valid() checks
  arch/sh/kernel/dwarf.c: use rbtree postorder iteration helper instead of solution using repeated rb_erase()
  fs-ext3-use-rbtree-postorder-iteration-helper-instead-of-opencoding-fix
  fs/ext3: use rbtree postorder iteration helper instead of opencoding
  fs/jffs2: use rbtree postorder iteration helper instead of opencoding
  fs/ext4: use rbtree postorder iteration helper instead of opencoding
  fs/ubifs: use rbtree postorder iteration helper instead of opencoding
  net/netfilter/ipset/ip_set_hash_netiface.c: use rbtree postorder iteration instead of opencoding
  rbtree/test: test rbtree_postorder_for_each_entry_safe()
  rbtree/test: move rb_node to the middle of the test struct
  rapidio: add modular rapidio core build into powerpc and mips branches
  partitions/efi: complete documentation of gpt kernel param purpose
  kdump: add /sys/kernel/vmcoreinfo ABI documentation
  kdump: fix exported size of vmcoreinfo note
  kexec: add sysctl to disable kexec_load
  fs/exec.c: call arch_pick_mmap_layout() only once
  ...

15 files changed, 760 insertions, 119 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index b1328a45b095..db933decc39c 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -212,6 +212,17 @@ config RTC_DRV_DS3232
           This driver can also be built as a module.  If so, the module
           will be called rtc-ds3232.
 
+config RTC_DRV_HYM8563
+        tristate "Haoyu Microelectronics HYM8563"
+        depends on I2C && OF
+        help
+          Say Y to enable support for the HYM8563 I2C RTC chip. Apart
+          from the usual rtc functions it provides a clock output of
+          up to 32kHz.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-hym8563.
+
 config RTC_DRV_LP8788
         tristate "TI LP8788 RTC driver"
         depends on MFD_LP8788
@@ -637,7 +648,7 @@ comment "Platform RTC drivers"
 
 config RTC_DRV_CMOS
         tristate "PC-style 'CMOS'"
-        depends on X86 || ARM || M32R || ATARI || PPC || MIPS || SPARC64
+        depends on X86 || ARM || M32R || PPC || MIPS || SPARC64
         default y if X86
         help
           Say "yes" here to get direct support for the real time clock
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index c00741a0bf10..b427bf7dd20d 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_RTC_DRV_EP93XX)	+= rtc-ep93xx.o
 obj-$(CONFIG_RTC_DRV_FM3130)    += rtc-fm3130.o
 obj-$(CONFIG_RTC_DRV_GENERIC)   += rtc-generic.o
 obj-$(CONFIG_RTC_DRV_HID_SENSOR_TIME) += rtc-hid-sensor-time.o
+obj-$(CONFIG_RTC_DRV_HYM8563)   += rtc-hym8563.o
 obj-$(CONFIG_RTC_DRV_IMXDI)     += rtc-imxdi.o
 obj-$(CONFIG_RTC_DRV_ISL1208)   += rtc-isl1208.o
 obj-$(CONFIG_RTC_DRV_ISL12022)  += rtc-isl12022.o
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 02426812bebc..589351ef75d0 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -14,6 +14,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/rtc.h>
 #include <linux/kdev_t.h>
 #include <linux/idr.h>
@@ -157,12 +158,27 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
 {
         struct rtc_device *rtc;
         struct rtc_wkalrm alrm;
-        int id, err;
+        int of_id = -1, id = -1, err;
+
+        if (dev->of_node)
+                of_id = of_alias_get_id(dev->of_node, "rtc");
+        else if (dev->parent && dev->parent->of_node)
+                of_id = of_alias_get_id(dev->parent->of_node, "rtc");
+
+        if (of_id >= 0) {
+                id = ida_simple_get(&rtc_ida, of_id, of_id + 1,
+                                    GFP_KERNEL);
+                if (id < 0)
+                        dev_warn(dev, "/aliases ID %d not available\n",
+                                    of_id);
+        }
 
-        id = ida_simple_get(&rtc_ida, 0, 0, GFP_KERNEL);
         if (id < 0) {
-                err = id;
-                goto exit;
+                id = ida_simple_get(&rtc_ida, 0, 0, GFP_KERNEL);
+                if (id < 0) {
+                        err = id;
+                        goto exit;
+                }
         }
 
         rtc = kzalloc(sizeof(struct rtc_device), GFP_KERNEL);
diff --git a/drivers/rtc/rtc-as3722.c b/drivers/rtc/rtc-as3722.c
index 9cfa8170a2d6..4af016985890 100644
--- a/drivers/rtc/rtc-as3722.c
+++ b/drivers/rtc/rtc-as3722.c
@@ -198,7 +198,7 @@ static int as3722_rtc_probe(struct platform_device *pdev)
 
         device_init_wakeup(&pdev->dev, 1);
 
-        as3722_rtc->rtc = rtc_device_register("as3722", &pdev->dev,
+        as3722_rtc->rtc = devm_rtc_device_register(&pdev->dev, "as3722-rtc",
                                 &as3722_rtc_ops, THIS_MODULE);
         if (IS_ERR(as3722_rtc->rtc)) {
                 ret = PTR_ERR(as3722_rtc->rtc);
@@ -209,28 +209,16 @@ static int as3722_rtc_probe(struct platform_device *pdev)
         as3722_rtc->alarm_irq = platform_get_irq(pdev, 0);
         dev_info(&pdev->dev, "RTC interrupt %d\n", as3722_rtc->alarm_irq);
 
-        ret = request_threaded_irq(as3722_rtc->alarm_irq, NULL,
+        ret = devm_request_threaded_irq(&pdev->dev, as3722_rtc->alarm_irq, NULL,
                         as3722_alarm_irq, IRQF_ONESHOT | IRQF_EARLY_RESUME,
                         "rtc-alarm", as3722_rtc);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Failed to request alarm IRQ %d: %d\n",
                                 as3722_rtc->alarm_irq, ret);
-                goto scrub;
+                return ret;
         }
         disable_irq(as3722_rtc->alarm_irq);
         return 0;
-scrub:
-        rtc_device_unregister(as3722_rtc->rtc);
-        return ret;
-}
-
-static int as3722_rtc_remove(struct platform_device *pdev)
-{
-        struct as3722_rtc *as3722_rtc = platform_get_drvdata(pdev);
-
-        free_irq(as3722_rtc->alarm_irq, as3722_rtc);
-        rtc_device_unregister(as3722_rtc->rtc);
-        return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -260,7 +248,6 @@ static const struct dev_pm_ops as3722_rtc_pm_ops = {
 
 static struct platform_driver as3722_rtc_driver = {
         .probe = as3722_rtc_probe,
-        .remove = as3722_rtc_remove,
         .driver = {
                 .name = "as3722-rtc",
                 .pm = &as3722_rtc_pm_ops,
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index a2325bc5e497..cae212f30d65 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -756,11 +756,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                 irq_handler_t rtc_cmos_int_handler;
 
                 if (is_hpet_enabled()) {
-                        int err;
-
                         rtc_cmos_int_handler = hpet_rtc_interrupt;
-                        err = hpet_register_irq_handler(cmos_interrupt);
-                        if (err != 0) {
+                        retval = hpet_register_irq_handler(cmos_interrupt);
+                        if (retval) {
                                 dev_warn(dev, "hpet_register_irq_handler "
                                                 " failed in rtc_init().");
                                 goto cleanup1;
@@ -1175,7 +1173,7 @@ static struct platform_driver cmos_platform_driver = {
         .remove         = __exit_p(cmos_platform_remove),
         .shutdown       = cmos_platform_shutdown,
         .driver = {
-                .name           = (char *) driver_name,
+                .name           = driver_name,
 #ifdef CONFIG_PM
                 .pm             = &cmos_pm_ops,
 #endif
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 80f323731ee2..2dd586a19b59 100644
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -787,7 +787,6 @@ static int ds1305_remove(struct spi_device *spi)
                 cancel_work_sync(&ds1305->work);
         }
 
-        spi_set_drvdata(spi, NULL);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 17b73fdc3b6e..5a1f3b2a8f1e 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -13,12 +13,13 @@
  */
 
 #include <linux/bcd.h>
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/gfp.h>
 #include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/rtc.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/module.h>
@@ -215,12 +216,19 @@ static int ds1742_rtc_remove(struct platform_device *pdev)
         return 0;
 }
 
+static struct of_device_id __maybe_unused ds1742_rtc_of_match[] = {
+        { .compatible = "maxim,ds1742", },
+        { }
+};
+MODULE_DEVICE_TABLE(of, ds1742_rtc_of_match);
+
 static struct platform_driver ds1742_rtc_driver = {
         .probe          = ds1742_rtc_probe,
         .remove         = ds1742_rtc_remove,
         .driver         = {
                 .name   = "rtc-ds1742",
                 .owner  = THIS_MODULE,
+                .of_match_table = ds1742_rtc_of_match,
         },
 };
 
diff --git a/drivers/rtc/rtc-hym8563.c b/drivers/rtc/rtc-hym8563.c
new file mode 100644
index 000000000000..bd628a6f981d
--- /dev/null
+++ b/drivers/rtc/rtc-hym8563.c
@@ -0,0 +1,606 @@
+/*
+ * Haoyu HYM8563 RTC driver
+ *
+ * Copyright (C) 2013 MundoReader S.L.
+ * Author: Heiko Stuebner <heiko@sntech.de>
+ *
+ * based on rtc-HYM8563
+ * Copyright (C) 2010 ROCKCHIP, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * 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.
+ */
+
+#include <linux/module.h>
+#include <linux/clk-provider.h>
+#include <linux/i2c.h>
+#include <linux/bcd.h>
+#include <linux/rtc.h>
+
+#define HYM8563_CTL1            0x00
+#define HYM8563_CTL1_TEST       BIT(7)
+#define HYM8563_CTL1_STOP       BIT(5)
+#define HYM8563_CTL1_TESTC      BIT(3)
+
+#define HYM8563_CTL2            0x01
+#define HYM8563_CTL2_TI_TP      BIT(4)
+#define HYM8563_CTL2_AF         BIT(3)
+#define HYM8563_CTL2_TF         BIT(2)
+#define HYM8563_CTL2_AIE        BIT(1)
+#define HYM8563_CTL2_TIE        BIT(0)
+
+#define HYM8563_SEC             0x02
+#define HYM8563_SEC_VL          BIT(7)
+#define HYM8563_SEC_MASK        0x7f
+
+#define HYM8563_MIN             0x03
+#define HYM8563_MIN_MASK        0x7f
+
+#define HYM8563_HOUR            0x04
+#define HYM8563_HOUR_MASK       0x3f
+
+#define HYM8563_DAY             0x05
+#define HYM8563_DAY_MASK        0x3f
+
+#define HYM8563_WEEKDAY         0x06
+#define HYM8563_WEEKDAY_MASK    0x07
+
+#define HYM8563_MONTH           0x07
+#define HYM8563_MONTH_CENTURY   BIT(7)
+#define HYM8563_MONTH_MASK      0x1f
+
+#define HYM8563_YEAR            0x08
+
+#define HYM8563_ALM_MIN         0x09
+#define HYM8563_ALM_HOUR        0x0a
+#define HYM8563_ALM_DAY         0x0b
+#define HYM8563_ALM_WEEK        0x0c
+
+/* Each alarm check can be disabled by setting this bit in the register */
+#define HYM8563_ALM_BIT_DISABLE BIT(7)
+
+#define HYM8563_CLKOUT          0x0d
+#define HYM8563_CLKOUT_DISABLE  BIT(7)
+#define HYM8563_CLKOUT_32768    0
+#define HYM8563_CLKOUT_1024     1
+#define HYM8563_CLKOUT_32       2
+#define HYM8563_CLKOUT_1        3
+#define HYM8563_CLKOUT_MASK     3
+
+#define HYM8563_TMR_CTL         0x0e
+#define HYM8563_TMR_CTL_ENABLE  BIT(7)
+#define HYM8563_TMR_CTL_4096    0
+#define HYM8563_TMR_CTL_64      1
+#define HYM8563_TMR_CTL_1       2
+#define HYM8563_TMR_CTL_1_60    3
+#define HYM8563_TMR_CTL_MASK    3
+
+#define HYM8563_TMR_CNT         0x0f
+
+struct hym8563 {
+        struct i2c_client       *client;
+        struct rtc_device       *rtc;
+        bool                    valid;
+#ifdef CONFIG_COMMON_CLK
+        struct clk_hw           clkout_hw;
+#endif
+};
+
+/*
+ * RTC handling
+ */
+
+static int hym8563_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct hym8563 *hym8563 = i2c_get_clientdata(client);
+        u8 buf[7];
+        int ret;
+
+        if (!hym8563->valid) {
+                dev_warn(&client->dev, "no valid clock/calendar values available\n");
+                return -EPERM;
+        }
+
+        ret = i2c_smbus_read_i2c_block_data(client, HYM8563_SEC, 7, buf);
+
+        tm->tm_sec = bcd2bin(buf[0] & HYM8563_SEC_MASK);
+        tm->tm_min = bcd2bin(buf[1] & HYM8563_MIN_MASK);
+        tm->tm_hour = bcd2bin(buf[2] & HYM8563_HOUR_MASK);
+        tm->tm_mday = bcd2bin(buf[3] & HYM8563_DAY_MASK);
+        tm->tm_wday = bcd2bin(buf[4] & HYM8563_WEEKDAY_MASK); /* 0 = Sun */
+        tm->tm_mon = bcd2bin(buf[5] & HYM8563_MONTH_MASK) - 1; /* 0 = Jan */
+        tm->tm_year = bcd2bin(buf[6]) + 100;
+
+        return 0;
+}
+
+static int hym8563_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct hym8563 *hym8563 = i2c_get_clientdata(client);
+        u8 buf[7];
+        int ret;
+
+        /* Years >= 2100 are to far in the future, 19XX is to early */
+        if (tm->tm_year < 100 || tm->tm_year >= 200)
+                return -EINVAL;
+
+        buf[0] = bin2bcd(tm->tm_sec);
+        buf[1] = bin2bcd(tm->tm_min);
+        buf[2] = bin2bcd(tm->tm_hour);
+        buf[3] = bin2bcd(tm->tm_mday);
+        buf[4] = bin2bcd(tm->tm_wday);
+        buf[5] = bin2bcd(tm->tm_mon + 1);
+
+        /*
+         * While the HYM8563 has a century flag in the month register,
+         * it does not seem to carry it over a subsequent write/read.
+         * So we'll limit ourself to 100 years, starting at 2000 for now.
+         */
+        buf[6] = tm->tm_year - 100;
+
+        /*
+         * CTL1 only contains TEST-mode bits apart from stop,
+         * so no need to read the value first
+         */
+        ret = i2c_smbus_write_byte_data(client, HYM8563_CTL1,
+                                                HYM8563_CTL1_STOP);
+        if (ret < 0)
+                return ret;
+
+        ret = i2c_smbus_write_i2c_block_data(client, HYM8563_SEC, 7, buf);
+        if (ret < 0)
+                return ret;
+
+        ret = i2c_smbus_write_byte_data(client, HYM8563_CTL1, 0);
+        if (ret < 0)
+                return ret;
+
+        hym8563->valid = true;
+
+        return 0;
+}
+
+static int hym8563_rtc_alarm_irq_enable(struct device *dev,
+                                        unsigned int enabled)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        int data;
+
+        data = i2c_smbus_read_byte_data(client, HYM8563_CTL2);
+        if (data < 0)
+                return data;
+
+        if (enabled)
+                data |= HYM8563_CTL2_AIE;
+        else
+                data &= ~HYM8563_CTL2_AIE;
+
+        return i2c_smbus_write_byte_data(client, HYM8563_CTL2, data);
+};
+
+static int hym8563_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct rtc_time *alm_tm = &alm->time;
+        u8 buf[4];
+        int ret;
+
+        ret = i2c_smbus_read_i2c_block_data(client, HYM8563_ALM_MIN, 4, buf);
+        if (ret < 0)
+                return ret;
+
+        /* The alarm only has a minute accuracy */
+        alm_tm->tm_sec = -1;
+
+        alm_tm->tm_min = (buf[0] & HYM8563_ALM_BIT_DISABLE) ?
+                                        -1 :
+                                        bcd2bin(buf[0] & HYM8563_MIN_MASK);
+        alm_tm->tm_hour = (buf[1] & HYM8563_ALM_BIT_DISABLE) ?
+                                        -1 :
+                                        bcd2bin(buf[1] & HYM8563_HOUR_MASK);
+        alm_tm->tm_mday = (buf[2] & HYM8563_ALM_BIT_DISABLE) ?
+                                        -1 :
+                                        bcd2bin(buf[2] & HYM8563_DAY_MASK);
+        alm_tm->tm_wday = (buf[3] & HYM8563_ALM_BIT_DISABLE) ?
+                                        -1 :
+                                        bcd2bin(buf[3] & HYM8563_WEEKDAY_MASK);
+
+        alm_tm->tm_mon = -1;
+        alm_tm->tm_year = -1;
+
+        ret = i2c_smbus_read_byte_data(client, HYM8563_CTL2);
+        if (ret < 0)
+                return ret;
+
+        if (ret & HYM8563_CTL2_AIE)
+                alm->enabled = 1;
+
+        return 0;
+}
+
+static int hym8563_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct rtc_time *alm_tm = &alm->time;
+        u8 buf[4];
+        int ret;
+
+        /*
+         * The alarm has no seconds so deal with it
+         */
+        if (alm_tm->tm_sec) {
+                alm_tm->tm_sec = 0;
+                alm_tm->tm_min++;
+                if (alm_tm->tm_min >= 60) {
+                        alm_tm->tm_min = 0;
+                        alm_tm->tm_hour++;
+                        if (alm_tm->tm_hour >= 24) {
+                                alm_tm->tm_hour = 0;
+                                alm_tm->tm_mday++;
+                                if (alm_tm->tm_mday > 31)
+                                        alm_tm->tm_mday = 0;
+                        }
+                }
+        }
+
+        ret = i2c_smbus_read_byte_data(client, HYM8563_CTL2);
+        if (ret < 0)
+                return ret;
+
+        ret &= ~HYM8563_CTL2_AIE;
+
+        ret = i2c_smbus_write_byte_data(client, HYM8563_CTL2, ret);
+        if (ret < 0)
+                return ret;
+
+        buf[0] = (alm_tm->tm_min < 60 && alm_tm->tm_min >= 0) ?
+                        bin2bcd(alm_tm->tm_min) : HYM8563_ALM_BIT_DISABLE;
+
+        buf[1] = (alm_tm->tm_hour < 24 && alm_tm->tm_hour >= 0) ?
+                        bin2bcd(alm_tm->tm_hour) : HYM8563_ALM_BIT_DISABLE;
+
+        buf[2] = (alm_tm->tm_mday <= 31 && alm_tm->tm_mday >= 1) ?
+                        bin2bcd(alm_tm->tm_mday) : HYM8563_ALM_BIT_DISABLE;
+
+        buf[3] = (alm_tm->tm_wday < 7 && alm_tm->tm_wday >= 0) ?
+                        bin2bcd(alm_tm->tm_wday) : HYM8563_ALM_BIT_DISABLE;
+
+        ret = i2c_smbus_write_i2c_block_data(client, HYM8563_ALM_MIN, 4, buf);
+        if (ret < 0)
+                return ret;
+
+        return hym8563_rtc_alarm_irq_enable(dev, alm->enabled);
+}
+
+static const struct rtc_class_ops hym8563_rtc_ops = {
+        .read_time              = hym8563_rtc_read_time,
+        .set_time               = hym8563_rtc_set_time,
+        .alarm_irq_enable       = hym8563_rtc_alarm_irq_enable,
+        .read_alarm             = hym8563_rtc_read_alarm,
+        .set_alarm              = hym8563_rtc_set_alarm,
+};
+
+/*
+ * Handling of the clkout
+ */
+
+#ifdef CONFIG_COMMON_CLK
+#define clkout_hw_to_hym8563(_hw) container_of(_hw, struct hym8563, clkout_hw)
+
+static int clkout_rates[] = {
+        32768,
+        1024,
+        32,
+        1,
+};
+
+static unsigned long hym8563_clkout_recalc_rate(struct clk_hw *hw,
+                                                unsigned long parent_rate)
+{
+        struct hym8563 *hym8563 = clkout_hw_to_hym8563(hw);
+        struct i2c_client *client = hym8563->client;
+        int ret = i2c_smbus_read_byte_data(client, HYM8563_CLKOUT);
+
+        if (ret < 0 || ret & HYM8563_CLKOUT_DISABLE)
+                return 0;
+
+        ret &= HYM8563_CLKOUT_MASK;
+        return clkout_rates[ret];
+}
+
+static long hym8563_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
+                                      unsigned long *prate)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(clkout_rates); i++)
+                if (clkout_rates[i] <= rate)
+                        return clkout_rates[i];
+
+        return 0;
+}
+
+static int hym8563_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
+                                   unsigned long parent_rate)
+{
+        struct hym8563 *hym8563 = clkout_hw_to_hym8563(hw);
+        struct i2c_client *client = hym8563->client;
+        int ret = i2c_smbus_read_byte_data(client, HYM8563_CLKOUT);
+        int i;
+
+        if (ret < 0)
+                return ret;
+
+        for (i = 0; i < ARRAY_SIZE(clkout_rates); i++)
+                if (clkout_rates[i] == rate) {
+                        ret &= ~HYM8563_CLKOUT_MASK;
+                        ret |= i;
+                        return i2c_smbus_write_byte_data(client,
+                                                         HYM8563_CLKOUT, ret);
+                }
+
+        return -EINVAL;
+}
+
+static int hym8563_clkout_control(struct clk_hw *hw, bool enable)
+{
+        struct hym8563 *hym8563 = clkout_hw_to_hym8563(hw);
+        struct i2c_client *client = hym8563->client;
+        int ret = i2c_smbus_read_byte_data(client, HYM8563_CLKOUT);
+
+        if (ret < 0)
+                return ret;
+
+        if (enable)
+                ret &= ~HYM8563_CLKOUT_DISABLE;
+        else
+                ret |= HYM8563_CLKOUT_DISABLE;
+
+        return i2c_smbus_write_byte_data(client, HYM8563_CLKOUT, ret);
+}
+
+static int hym8563_clkout_prepare(struct clk_hw *hw)
+{
+        return hym8563_clkout_control(hw, 1);
+}
+
+static void hym8563_clkout_unprepare(struct clk_hw *hw)
+{
+        hym8563_clkout_control(hw, 0);
+}
+
+static int hym8563_clkout_is_prepared(struct clk_hw *hw)
+{
+        struct hym8563 *hym8563 = clkout_hw_to_hym8563(hw);
+        struct i2c_client *client = hym8563->client;
+        int ret = i2c_smbus_read_byte_data(client, HYM8563_CLKOUT);
+
+        if (ret < 0)
+                return ret;
+
+        return !(ret & HYM8563_CLKOUT_DISABLE);
+}
+
+static const struct clk_ops hym8563_clkout_ops = {
+        .prepare = hym8563_clkout_prepare,
+        .unprepare = hym8563_clkout_unprepare,
+        .is_prepared = hym8563_clkout_is_prepared,
+        .recalc_rate = hym8563_clkout_recalc_rate,
+        .round_rate = hym8563_clkout_round_rate,
+        .set_rate = hym8563_clkout_set_rate,
+};
+
+static struct clk *hym8563_clkout_register_clk(struct hym8563 *hym8563)
+{
+        struct i2c_client *client = hym8563->client;
+        struct device_node *node = client->dev.of_node;
+        struct clk *clk;
+        struct clk_init_data init;
+        int ret;
+
+        ret = i2c_smbus_write_byte_data(client, HYM8563_CLKOUT,
+                                                HYM8563_CLKOUT_DISABLE);
+        if (ret < 0)
+                return ERR_PTR(ret);
+
+        init.name = "hym8563-clkout";
+        init.ops = &hym8563_clkout_ops;
+        init.flags = CLK_IS_ROOT;
+        init.parent_names = NULL;
+        init.num_parents = 0;
+        hym8563->clkout_hw.init = &init;
+
+        /* register the clock */
+        clk = clk_register(&client->dev, &hym8563->clkout_hw);
+
+        if (!IS_ERR(clk))
+                of_clk_add_provider(node, of_clk_src_simple_get, clk);
+
+        return clk;
+}
+#endif
+
+/*
+ * The alarm interrupt is implemented as a level-low interrupt in the
+ * hym8563, while the timer interrupt uses a falling edge.
+ * We don't use the timer at all, so the interrupt is requested to
+ * use the level-low trigger.
+ */
+static irqreturn_t hym8563_irq(int irq, void *dev_id)
+{
+        struct hym8563 *hym8563 = (struct hym8563 *)dev_id;
+        struct i2c_client *client = hym8563->client;
+        struct mutex *lock = &hym8563->rtc->ops_lock;
+        int data, ret;
+
+        mutex_lock(lock);
+
+        /* Clear the alarm flag */
+
+        data = i2c_smbus_read_byte_data(client, HYM8563_CTL2);
+        if (data < 0) {
+                dev_err(&client->dev, "%s: error reading i2c data %d\n",
+                        __func__, data);
+                goto out;
+        }
+
+        data &= ~HYM8563_CTL2_AF;
+
+        ret = i2c_smbus_write_byte_data(client, HYM8563_CTL2, data);
+        if (ret < 0) {
+                dev_err(&client->dev, "%s: error writing i2c data %d\n",
+                        __func__, ret);
+        }
+
+out:
+        mutex_unlock(lock);
+        return IRQ_HANDLED;
+}
+
+static int hym8563_init_device(struct i2c_client *client)
+{
+        int ret;
+
+        /* Clear stop flag if present */
+        ret = i2c_smbus_write_byte_data(client, HYM8563_CTL1, 0);
+        if (ret < 0)
+                return ret;
+
+        ret = i2c_smbus_read_byte_data(client, HYM8563_CTL2);
+        if (ret < 0)
+                return ret;
+
+        /* Disable alarm and timer interrupts */
+        ret &= ~HYM8563_CTL2_AIE;
+        ret &= ~HYM8563_CTL2_TIE;
+
+        /* Clear any pending alarm and timer flags */
+        if (ret & HYM8563_CTL2_AF)
+                ret &= ~HYM8563_CTL2_AF;
+
+        if (ret & HYM8563_CTL2_TF)
+                ret &= ~HYM8563_CTL2_TF;
+
+        ret &= ~HYM8563_CTL2_TI_TP;
+
+        return i2c_smbus_write_byte_data(client, HYM8563_CTL2, ret);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int hym8563_suspend(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        int ret;
+
+        if (device_may_wakeup(dev)) {
+                ret = enable_irq_wake(client->irq);
+                if (ret) {
+                        dev_err(dev, "enable_irq_wake failed, %d\n", ret);
+                        return ret;
+                }
+        }
+
+        return 0;
+}
+
+static int hym8563_resume(struct device *dev)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+
+        if (device_may_wakeup(dev))
+                disable_irq_wake(client->irq);
+
+        return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(hym8563_pm_ops, hym8563_suspend, hym8563_resume);
+
+static int hym8563_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
+{
+        struct hym8563 *hym8563;
+        int ret;
+
+        hym8563 = devm_kzalloc(&client->dev, sizeof(*hym8563), GFP_KERNEL);
+        if (!hym8563)
+                return -ENOMEM;
+
+        hym8563->client = client;
+        i2c_set_clientdata(client, hym8563);
+
+        device_set_wakeup_capable(&client->dev, true);
+
+        ret = hym8563_init_device(client);
+        if (ret) {
+                dev_err(&client->dev, "could not init device, %d\n", ret);
+                return ret;
+        }
+
+        ret = devm_request_threaded_irq(&client->dev, client->irq,
+                                        NULL, hym8563_irq,
+                                        IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+                                        client->name, hym8563);
+        if (ret < 0) {
+                dev_err(&client->dev, "irq %d request failed, %d\n",
+                        client->irq, ret);
+                return ret;
+        }
+
+        /* check state of calendar information */
+        ret = i2c_smbus_read_byte_data(client, HYM8563_SEC);
+        if (ret < 0)
+                return ret;
+
+        hym8563->valid = !(ret & HYM8563_SEC_VL);
+        dev_dbg(&client->dev, "rtc information is %s\n",
+                hym8563->valid ? "valid" : "invalid");
+
+        hym8563->rtc = devm_rtc_device_register(&client->dev, client->name,
+                                                &hym8563_rtc_ops, THIS_MODULE);
+        if (IS_ERR(hym8563->rtc))
+                return PTR_ERR(hym8563->rtc);
+
+#ifdef CONFIG_COMMON_CLK
+        hym8563_clkout_register_clk(hym8563);
+#endif
+
+        return 0;
+}
+
+static const struct i2c_device_id hym8563_id[] = {
+        { "hym8563", 0 },
+        {},
+};
+MODULE_DEVICE_TABLE(i2c, hym8563_id);
+
+static struct of_device_id hym8563_dt_idtable[] = {
+        { .compatible = "haoyu,hym8563" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, hym8563_dt_idtable);
+
+static struct i2c_driver hym8563_driver = {
+        .driver         = {
+                .name   = "rtc-hym8563",
+                .owner  = THIS_MODULE,
+                .pm     = &hym8563_pm_ops,
+                .of_match_table = hym8563_dt_idtable,
+        },
+        .probe          = hym8563_probe,
+        .id_table       = hym8563_id,
+};
+
+module_i2c_driver(hym8563_driver);
+
+MODULE_AUTHOR("Heiko Stuebner <heiko@sntech.de>");
+MODULE_DESCRIPTION("HYM8563 RTC driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c
index 8e45b3c4aa2f..3032178bd9e6 100644
--- a/drivers/rtc/rtc-max8907.c
+++ b/drivers/rtc/rtc-max8907.c
@@ -51,7 +51,7 @@ static irqreturn_t max8907_irq_handler(int irq, void *data)
 {
         struct max8907_rtc *rtc = data;
 
-        regmap_update_bits(rtc->regmap, MAX8907_REG_ALARM0_CNTL, 0x7f, 0);
+        regmap_write(rtc->regmap, MAX8907_REG_ALARM0_CNTL, 0);
 
         rtc_update_irq(rtc->rtc_dev, 1, RTC_IRQF | RTC_AF);
 
@@ -64,7 +64,7 @@ static void regs_to_tm(u8 *regs, struct rtc_time *tm)
                 bcd2bin(regs[RTC_YEAR1]) - 1900;
         tm->tm_mon = bcd2bin(regs[RTC_MONTH] & 0x1f) - 1;
         tm->tm_mday = bcd2bin(regs[RTC_DATE] & 0x3f);
-        tm->tm_wday = (regs[RTC_WEEKDAY] & 0x07) - 1;
+        tm->tm_wday = (regs[RTC_WEEKDAY] & 0x07);
         if (regs[RTC_HOUR] & HOUR_12) {
                 tm->tm_hour = bcd2bin(regs[RTC_HOUR] & 0x01f);
                 if (tm->tm_hour == 12)
@@ -88,7 +88,7 @@ static void tm_to_regs(struct rtc_time *tm, u8 *regs)
         regs[RTC_YEAR1] = bin2bcd(low);
         regs[RTC_MONTH] = bin2bcd(tm->tm_mon + 1);
         regs[RTC_DATE] = bin2bcd(tm->tm_mday);
-        regs[RTC_WEEKDAY] = tm->tm_wday + 1;
+        regs[RTC_WEEKDAY] = tm->tm_wday;
         regs[RTC_HOUR] = bin2bcd(tm->tm_hour);
         regs[RTC_MIN] = bin2bcd(tm->tm_min);
         regs[RTC_SEC] = bin2bcd(tm->tm_sec);
@@ -153,7 +153,7 @@ static int max8907_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
         tm_to_regs(&alrm->time, regs);
 
         /* Disable alarm while we update the target time */
-        ret = regmap_update_bits(rtc->regmap, MAX8907_REG_ALARM0_CNTL, 0x7f, 0);
+        ret = regmap_write(rtc->regmap, MAX8907_REG_ALARM0_CNTL, 0);
         if (ret < 0)
                 return ret;
 
@@ -163,8 +163,7 @@ static int max8907_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
                 return ret;
 
         if (alrm->enabled)
-                ret = regmap_update_bits(rtc->regmap, MAX8907_REG_ALARM0_CNTL,
-                                         0x7f, 0x7f);
+                ret = regmap_write(rtc->regmap, MAX8907_REG_ALARM0_CNTL, 0x77);
 
         return ret;
 }
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c
index 50c572645546..419874fefa4b 100644
--- a/drivers/rtc/rtc-mxc.c
+++ b/drivers/rtc/rtc-mxc.c
@@ -391,11 +391,13 @@ static int mxc_rtc_probe(struct platform_device *pdev)
         pdata->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(pdata->clk)) {
                 dev_err(&pdev->dev, "unable to get clock!\n");
-                ret = PTR_ERR(pdata->clk);
-                goto exit_free_pdata;
+                return PTR_ERR(pdata->clk);
         }
 
-        clk_prepare_enable(pdata->clk);
+        ret = clk_prepare_enable(pdata->clk);
+        if (ret)
+                return ret;
+
         rate = clk_get_rate(pdata->clk);
 
         if (rate == 32768)
@@ -447,8 +449,6 @@ static int mxc_rtc_probe(struct platform_device *pdev)
 exit_put_clk:
         clk_disable_unprepare(pdata->clk);
 
-exit_free_pdata:
-
         return ret;
 }
 
diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c
index 1ee514a3972c..9bd842e97749 100644
--- a/drivers/rtc/rtc-pcf2127.c
+++ b/drivers/rtc/rtc-pcf2127.c
@@ -197,10 +197,7 @@ static int pcf2127_probe(struct i2c_client *client,
                                 pcf2127_driver.driver.name,
                                 &pcf2127_rtc_ops, THIS_MODULE);
 
-        if (IS_ERR(pcf2127->rtc))
-                return PTR_ERR(pcf2127->rtc);
-
-        return 0;
+        return PTR_ERR_OR_ZERO(pcf2127->rtc);
 }
 
 static const struct i2c_device_id pcf2127_id[] = {
diff --git a/drivers/rtc/rtc-rx8581.c b/drivers/rtc/rtc-rx8581.c
index 00b0eb7fe166..de8d9c427782 100644
--- a/drivers/rtc/rtc-rx8581.c
+++ b/drivers/rtc/rtc-rx8581.c
@@ -52,8 +52,45 @@
 #define RX8581_CTRL_STOP        0x02 /* STOP bit */
 #define RX8581_CTRL_RESET       0x01 /* RESET bit */
 
+struct rx8581 {
+        struct i2c_client       *client;
+        struct rtc_device       *rtc;
+        s32 (*read_block_data)(const struct i2c_client *client, u8 command,
+                                u8 length, u8 *values);
+        s32 (*write_block_data)(const struct i2c_client *client, u8 command,
+                                u8 length, const u8 *values);
+};
+
 static struct i2c_driver rx8581_driver;
 
+static int rx8581_read_block_data(const struct i2c_client *client, u8 command,
+                                        u8 length, u8 *values)
+{
+        s32 i, data;
+
+        for (i = 0; i < length; i++) {
+                data = i2c_smbus_read_byte_data(client, command + i);
+                if (data < 0)
+                        return data;
+                values[i] = data;
+        }
+        return i;
+}
+
+static int rx8581_write_block_data(const struct i2c_client *client, u8 command,
+                                        u8 length, const u8 *values)
+{
+        s32 i, ret;
+
+        for (i = 0; i < length; i++) {
+                ret = i2c_smbus_write_byte_data(client, command + i,
+                                                values[i]);
+                if (ret < 0)
+                        return ret;
+        }
+        return length;
+}
+
 /*
  * In the routines that deal directly with the rx8581 hardware, we use
  * rtc_time -- month 0-11, hour 0-23, yr = calendar year-epoch.
@@ -62,6 +99,7 @@ static int rx8581_get_datetime(struct i2c_client *client, struct rtc_time *tm)
 {
         unsigned char date[7];
         int data, err;
+        struct rx8581 *rx8581 = i2c_get_clientdata(client);
 
         /* First we ensure that the "update flag" is not set, we read the
          * time and date then re-read the "update flag". If the update flag
@@ -80,14 +118,13 @@ static int rx8581_get_datetime(struct i2c_client *client, struct rtc_time *tm)
                         err = i2c_smbus_write_byte_data(client,
                                 RX8581_REG_FLAG, (data & ~RX8581_FLAG_UF));
                         if (err != 0) {
-                                dev_err(&client->dev, "Unable to write device "
-                                        "flags\n");
+                                dev_err(&client->dev, "Unable to write device flags\n");
                                 return -EIO;
                         }
                 }
 
                 /* Now read time and date */
-                err = i2c_smbus_read_i2c_block_data(client, RX8581_REG_SC,
+                err = rx8581->read_block_data(client, RX8581_REG_SC,
                         7, date);
                 if (err < 0) {
                         dev_err(&client->dev, "Unable to read date\n");
@@ -140,6 +177,7 @@ static int rx8581_set_datetime(struct i2c_client *client, struct rtc_time *tm)
 {
         int data, err;
         unsigned char buf[7];
+        struct rx8581 *rx8581 = i2c_get_clientdata(client);
 
         dev_dbg(&client->dev, "%s: secs=%d, mins=%d, hours=%d, "
                 "mday=%d, mon=%d, year=%d, wday=%d\n",
@@ -176,7 +214,7 @@ static int rx8581_set_datetime(struct i2c_client *client, struct rtc_time *tm)
         }
 
         /* write register's data */
-        err = i2c_smbus_write_i2c_block_data(client, RX8581_REG_SC, 7, buf);
+        err = rx8581->write_block_data(client, RX8581_REG_SC, 7, buf);
         if (err < 0) {
                 dev_err(&client->dev, "Unable to write to date registers\n");
                 return -EIO;
@@ -231,22 +269,39 @@ static const struct rtc_class_ops rx8581_rtc_ops = {
 static int rx8581_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
-        struct rtc_device *rtc;
+        struct rx8581     *rx8581;
 
         dev_dbg(&client->dev, "%s\n", __func__);
 
-        if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
-                return -ENODEV;
+        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)
+                && !i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK))
+                return -EIO;
 
-        dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+        rx8581 = devm_kzalloc(&client->dev, sizeof(struct rx8581), GFP_KERNEL);
+        if (!rx8581)
+                return -ENOMEM;
 
-        rtc = devm_rtc_device_register(&client->dev, rx8581_driver.driver.name,
-                                        &rx8581_rtc_ops, THIS_MODULE);
+        i2c_set_clientdata(client, rx8581);
+        rx8581->client = client;
 
-        if (IS_ERR(rtc))
-                return PTR_ERR(rtc);
+        if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
+                rx8581->read_block_data = i2c_smbus_read_i2c_block_data;
+                rx8581->write_block_data = i2c_smbus_write_i2c_block_data;
+        } else {
+                rx8581->read_block_data = rx8581_read_block_data;
+                rx8581->write_block_data = rx8581_write_block_data;
+        }
 
-        i2c_set_clientdata(client, rtc);
+        dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+
+        rx8581->rtc = devm_rtc_device_register(&client->dev,
+                rx8581_driver.driver.name, &rx8581_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rx8581->rtc)) {
+                dev_err(&client->dev,
+                        "unable to register the class device\n");
+                return PTR_ERR(rx8581->rtc);
+        }
 
         return 0;
 }
diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index ae8119dc2846..476af93543f6 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -639,6 +639,7 @@ static void s5m_rtc_shutdown(struct platform_device *pdev)
         s5m_rtc_enable_smpl(info, false);
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int s5m_rtc_resume(struct device *dev)
 {
         struct s5m_rtc_info *info = dev_get_drvdata(dev);
@@ -660,6 +661,7 @@ static int s5m_rtc_suspend(struct device *dev)
 
         return ret;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(s5m_rtc_pm_ops, s5m_rtc_suspend, s5m_rtc_resume);
 
diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c
index c2e80d7ca5e2..1915464e4cd6 100644
--- a/drivers/rtc/rtc-twl.c
+++ b/drivers/rtc/rtc-twl.c
@@ -479,7 +479,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
         u8 rd_reg;
 
         if (irq <= 0)
-                goto out1;
+                return ret;
 
         /* Initialize the register map */
         if (twl_class_is_4030())
@@ -489,7 +489,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
 
         ret = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
         if (ret < 0)
-                goto out1;
+                return ret;
 
         if (rd_reg & BIT_RTC_STATUS_REG_POWER_UP_M)
                 dev_warn(&pdev->dev, "Power up reset detected.\n");
@@ -500,7 +500,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
         /* Clear RTC Power up reset and pending alarm interrupts */
         ret = twl_rtc_write_u8(rd_reg, REG_RTC_STATUS_REG);
         if (ret < 0)
-                goto out1;
+                return ret;
 
         if (twl_class_is_6030()) {
                 twl6030_interrupt_unmask(TWL6030_RTC_INT_MASK,
@@ -512,7 +512,7 @@ static int twl_rtc_probe(struct platform_device *pdev)
         dev_info(&pdev->dev, "Enabling TWL-RTC\n");
         ret = twl_rtc_write_u8(BIT_RTC_CTRL_REG_STOP_RTC_M, REG_RTC_CTRL_REG);
         if (ret < 0)
-                goto out1;
+                return ret;
 
         /* ensure interrupts are disabled, bootloaders can be strange */
         ret = twl_rtc_write_u8(0, REG_RTC_INTERRUPTS_REG);
@@ -522,34 +522,29 @@ static int twl_rtc_probe(struct platform_device *pdev)
         /* init cached IRQ enable bits */
         ret = twl_rtc_read_u8(&rtc_irq_bits, REG_RTC_INTERRUPTS_REG);
         if (ret < 0)
-                goto out1;
+                return ret;
 
         device_init_wakeup(&pdev->dev, 1);
 
-        rtc = rtc_device_register(pdev->name,
-                                  &pdev->dev, &twl_rtc_ops, THIS_MODULE);
+        rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+                                        &twl_rtc_ops, THIS_MODULE);
         if (IS_ERR(rtc)) {
-                ret = PTR_ERR(rtc);
                 dev_err(&pdev->dev, "can't register RTC device, err %ld\n",
                         PTR_ERR(rtc));
-                goto out1;
+                return PTR_ERR(rtc);
         }
 
-        ret = request_threaded_irq(irq, NULL, twl_rtc_interrupt,
-                                   IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-                                   dev_name(&rtc->dev), rtc);
+        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
+                                        twl_rtc_interrupt,
+                                        IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+                                        dev_name(&rtc->dev), rtc);
         if (ret < 0) {
                 dev_err(&pdev->dev, "IRQ is not free.\n");
-                goto out2;
+                return ret;
         }
 
         platform_set_drvdata(pdev, rtc);
         return 0;
-
-out2:
-        rtc_device_unregister(rtc);
-out1:
-        return ret;
 }
 
 /*
@@ -559,9 +554,6 @@ out1:
 static int twl_rtc_remove(struct platform_device *pdev)
 {
         /* leave rtc running, but disable irqs */
-        struct rtc_device *rtc = platform_get_drvdata(pdev);
-        int irq = platform_get_irq(pdev, 0);
-
         mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
         mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
         if (twl_class_is_6030()) {
@@ -571,10 +563,6 @@ static int twl_rtc_remove(struct platform_device *pdev)
                         REG_INT_MSK_STS_A);
         }
 
-
-        free_irq(irq, rtc);
-
-        rtc_device_unregister(rtc);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index aabc22c587fb..88c9c92e89fd 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -293,7 +293,7 @@ static int rtc_probe(struct platform_device *pdev)
         if (!res)
                 return -EBUSY;
 
-        rtc1_base = ioremap(res->start, resource_size(res));
+        rtc1_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
         if (!rtc1_base)
                 return -EBUSY;
 
@@ -303,13 +303,14 @@ static int rtc_probe(struct platform_device *pdev)
                 goto err_rtc1_iounmap;
         }
 
-        rtc2_base = ioremap(res->start, resource_size(res));
+        rtc2_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
         if (!rtc2_base) {
                 retval = -EBUSY;
                 goto err_rtc1_iounmap;
         }
 
-        rtc = rtc_device_register(rtc_name, &pdev->dev, &vr41xx_rtc_ops, THIS_MODULE);
+        rtc = devm_rtc_device_register(&pdev->dev, rtc_name, &vr41xx_rtc_ops,
+                                        THIS_MODULE);
         if (IS_ERR(rtc)) {
                 retval = PTR_ERR(rtc);
                 goto err_iounmap_all;
@@ -330,24 +331,24 @@ static int rtc_probe(struct platform_device *pdev)
         aie_irq = platform_get_irq(pdev, 0);
         if (aie_irq <= 0) {
                 retval = -EBUSY;
-                goto err_device_unregister;
+                goto err_iounmap_all;
         }
 
-        retval = request_irq(aie_irq, elapsedtime_interrupt, 0,
-                             "elapsed_time", pdev);
+        retval = devm_request_irq(&pdev->dev, aie_irq, elapsedtime_interrupt, 0,
+                                "elapsed_time", pdev);
         if (retval < 0)
-                goto err_device_unregister;
+                goto err_iounmap_all;
 
         pie_irq = platform_get_irq(pdev, 1);
         if (pie_irq <= 0) {
                 retval = -EBUSY;
-                goto err_free_irq;
+                goto err_iounmap_all;
         }
 
-        retval = request_irq(pie_irq, rtclong1_interrupt, 0,
-                             "rtclong1", pdev);
+        retval = devm_request_irq(&pdev->dev, pie_irq, rtclong1_interrupt, 0,
+                                "rtclong1", pdev);
         if (retval < 0)
-                goto err_free_irq;
+                goto err_iounmap_all;
 
         platform_set_drvdata(pdev, rtc);
 
@@ -358,47 +359,20 @@ static int rtc_probe(struct platform_device *pdev)
 
         return 0;
 
-err_free_irq:
-        free_irq(aie_irq, pdev);
-
-err_device_unregister:
-        rtc_device_unregister(rtc);
-
 err_iounmap_all:
-        iounmap(rtc2_base);
         rtc2_base = NULL;
 
 err_rtc1_iounmap:
-        iounmap(rtc1_base);
         rtc1_base = NULL;
 
         return retval;
 }
 
-static int rtc_remove(struct platform_device *pdev)
-{
-        struct rtc_device *rtc;
-
-        rtc = platform_get_drvdata(pdev);
-        if (rtc)
-                rtc_device_unregister(rtc);
-
-        free_irq(aie_irq, pdev);
-        free_irq(pie_irq, pdev);
-        if (rtc1_base)
-                iounmap(rtc1_base);
-        if (rtc2_base)
-                iounmap(rtc2_base);
-
-        return 0;
-}
-
 /* work with hotplug and coldplug */
 MODULE_ALIAS("platform:RTC");
 
 static struct platform_driver rtc_platform_driver = {
         .probe          = rtc_probe,
-        .remove         = rtc_remove,
         .driver         = {
                 .name   = rtc_name,
                 .owner  = THIS_MODULE,