5 files changed, 393 insertions, 116 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 4ad831de41ad..cced4d108319 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -502,6 +502,13 @@ config RTC_DRV_WM8350
           This driver can also be built as a module. If so, the module
           will be called "rtc-wm8350".
 
+config RTC_DRV_PCF50633
+        depends on MFD_PCF50633
+        tristate "NXP PCF50633 RTC"
+        help
+          If you say yes here you get support for the RTC subsystem of the
+          NXP PCF50633 used in embedded systems.
+
 comment "on-CPU RTC drivers"
 
 config RTC_DRV_OMAP
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 9a4340d48f26..6e28021abb9d 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -74,3 +74,4 @@ obj-$(CONFIG_RTC_DRV_V3020)	+= rtc-v3020.o
 obj-$(CONFIG_RTC_DRV_VR41XX)    += rtc-vr41xx.o
 obj-$(CONFIG_RTC_DRV_WM8350)    += rtc-wm8350.o
 obj-$(CONFIG_RTC_DRV_X1205)     += rtc-x1205.o
+obj-$(CONFIG_RTC_DRV_PCF50633)  += rtc-pcf50633.o
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 162330b9d1dc..7e5155e88ac7 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -86,13 +86,11 @@ enum ds_type {
 
 
 struct ds1307 {
-        u8                      reg_addr;
         u8                      regs[11];
         enum ds_type            type;
         unsigned long           flags;
 #define HAS_NVRAM       0               /* bit 0 == sysfs file active */
 #define HAS_ALARM       1               /* bit 1 == irq claimed */
-        struct i2c_msg          msg[2];
         struct i2c_client       *client;
         struct rtc_device       *rtc;
         struct work_struct      work;
@@ -204,13 +202,9 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t)
         int             tmp;
 
         /* read the RTC date and time registers all at once */
-        ds1307->reg_addr = 0;
-        ds1307->msg[1].flags = I2C_M_RD;
-        ds1307->msg[1].len = 7;
-
-        tmp = i2c_transfer(to_i2c_adapter(ds1307->client->dev.parent),
-                        ds1307->msg, 2);
-        if (tmp != 2) {
+        tmp = i2c_smbus_read_i2c_block_data(ds1307->client,
+                DS1307_REG_SECS, 7, ds1307->regs);
+        if (tmp != 7) {
                 dev_err(dev, "%s error %d\n", "read", tmp);
                 return -EIO;
         }
@@ -257,7 +251,6 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
                 t->tm_hour, t->tm_mday,
                 t->tm_mon, t->tm_year, t->tm_wday);
 
-        *buf++ = 0;             /* first register addr */
         buf[DS1307_REG_SECS] = bin2bcd(t->tm_sec);
         buf[DS1307_REG_MIN] = bin2bcd(t->tm_min);
         buf[DS1307_REG_HOUR] = bin2bcd(t->tm_hour);
@@ -282,23 +275,19 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t)
                 break;
         }
 
-        ds1307->msg[1].flags = 0;
-        ds1307->msg[1].len = 8;
-
         dev_dbg(dev, "%s: %02x %02x %02x %02x %02x %02x %02x\n",
                 "write", buf[0], buf[1], buf[2], buf[3],
                 buf[4], buf[5], buf[6]);
 
-        result = i2c_transfer(to_i2c_adapter(ds1307->client->dev.parent),
-                        &ds1307->msg[1], 1);
-        if (result != 1) {
-                dev_err(dev, "%s error %d\n", "write", tmp);
-                return -EIO;
+        result = i2c_smbus_write_i2c_block_data(ds1307->client, 0, 7, buf);
+        if (result < 0) {
+                dev_err(dev, "%s error %d\n", "write", result);
+                return result;
         }
         return 0;
 }
 
-static int ds1307_read_alarm(struct device *dev, struct rtc_wkalrm *t)
+static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t)
 {
         struct i2c_client       *client = to_i2c_client(dev);
         struct ds1307           *ds1307 = i2c_get_clientdata(client);
@@ -308,13 +297,9 @@ static int ds1307_read_alarm(struct device *dev, struct rtc_wkalrm *t)
                 return -EINVAL;
 
         /* read all ALARM1, ALARM2, and status registers at once */
-        ds1307->reg_addr = DS1339_REG_ALARM1_SECS;
-        ds1307->msg[1].flags = I2C_M_RD;
-        ds1307->msg[1].len = 9;
-
-        ret = i2c_transfer(to_i2c_adapter(client->dev.parent),
-                        ds1307->msg, 2);
-        if (ret != 2) {
+        ret = i2c_smbus_read_i2c_block_data(client,
+                        DS1339_REG_ALARM1_SECS, 9, ds1307->regs);
+        if (ret != 9) {
                 dev_err(dev, "%s error %d\n", "alarm read", ret);
                 return -EIO;
         }
@@ -353,7 +338,7 @@ static int ds1307_read_alarm(struct device *dev, struct rtc_wkalrm *t)
         return 0;
 }
 
-static int ds1307_set_alarm(struct device *dev, struct rtc_wkalrm *t)
+static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t)
 {
         struct i2c_client       *client = to_i2c_client(dev);
         struct ds1307           *ds1307 = i2c_get_clientdata(client);
@@ -371,13 +356,9 @@ static int ds1307_set_alarm(struct device *dev, struct rtc_wkalrm *t)
                 t->enabled, t->pending);
 
         /* read current status of both alarms and the chip */
-        ds1307->reg_addr = DS1339_REG_ALARM1_SECS;
-        ds1307->msg[1].flags = I2C_M_RD;
-        ds1307->msg[1].len = 9;
-
-        ret = i2c_transfer(to_i2c_adapter(client->dev.parent),
-                        ds1307->msg, 2);
-        if (ret != 2) {
+        ret = i2c_smbus_read_i2c_block_data(client,
+                        DS1339_REG_ALARM1_SECS, 9, buf);
+        if (ret != 9) {
                 dev_err(dev, "%s error %d\n", "alarm write", ret);
                 return -EIO;
         }
@@ -392,7 +373,6 @@ static int ds1307_set_alarm(struct device *dev, struct rtc_wkalrm *t)
                         ds1307->regs[6], control, status);
 
         /* set ALARM1, using 24 hour and day-of-month modes */
-        *buf++ = DS1339_REG_ALARM1_SECS;        /* first register addr */
         buf[0] = bin2bcd(t->time.tm_sec);
         buf[1] = bin2bcd(t->time.tm_min);
         buf[2] = bin2bcd(t->time.tm_hour);
@@ -411,14 +391,11 @@ static int ds1307_set_alarm(struct device *dev, struct rtc_wkalrm *t)
         }
         buf[8] = status & ~(DS1337_BIT_A1I | DS1337_BIT_A2I);
 
-        ds1307->msg[1].flags = 0;
-        ds1307->msg[1].len = 10;
-
-        ret = i2c_transfer(to_i2c_adapter(client->dev.parent),
-                        &ds1307->msg[1], 1);
-        if (ret != 1) {
+        ret = i2c_smbus_write_i2c_block_data(client,
+                        DS1339_REG_ALARM1_SECS, 9, buf);
+        if (ret < 0) {
                 dev_err(dev, "can't set alarm time\n");
-                return -EIO;
+                return ret;
         }
 
         return 0;
@@ -475,8 +452,8 @@ static int ds1307_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 static const struct rtc_class_ops ds13xx_rtc_ops = {
         .read_time      = ds1307_get_time,
         .set_time       = ds1307_set_time,
-        .read_alarm     = ds1307_read_alarm,
-        .set_alarm      = ds1307_set_alarm,
+        .read_alarm     = ds1337_read_alarm,
+        .set_alarm      = ds1337_set_alarm,
         .ioctl          = ds1307_ioctl,
 };
 
@@ -490,7 +467,6 @@ ds1307_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
 {
         struct i2c_client       *client;
         struct ds1307           *ds1307;
-        struct i2c_msg          msg[2];
         int                     result;
 
         client = kobj_to_i2c_client(kobj);
@@ -503,24 +479,10 @@ ds1307_nvram_read(struct kobject *kobj, struct bin_attribute *attr,
         if (unlikely(!count))
                 return count;
 
-        msg[0].addr = client->addr;
-        msg[0].flags = 0;
-        msg[0].len = 1;
-        msg[0].buf = buf;
-
-        buf[0] = 8 + off;
-
-        msg[1].addr = client->addr;
-        msg[1].flags = I2C_M_RD;
-        msg[1].len = count;
-        msg[1].buf = buf;
-
-        result = i2c_transfer(to_i2c_adapter(client->dev.parent), msg, 2);
-        if (result != 2) {
+        result = i2c_smbus_read_i2c_block_data(client, 8 + off, count, buf);
+        if (result < 0)
                 dev_err(&client->dev, "%s error %d\n", "nvram read", result);
-                return -EIO;
-        }
-        return count;
+        return result;
 }
 
 static ssize_t
@@ -528,8 +490,7 @@ ds1307_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct i2c_client       *client;
-        u8                      buffer[NVRAM_SIZE + 1];
-        int                     ret;
+        int                     result;
 
         client = kobj_to_i2c_client(kobj);
 
@@ -540,11 +501,12 @@ ds1307_nvram_write(struct kobject *kobj, struct bin_attribute *attr,
         if (unlikely(!count))
                 return count;
 
-        buffer[0] = 8 + off;
-        memcpy(buffer + 1, buf, count);
-
-        ret = i2c_master_send(client, buffer, count + 1);
-        return (ret < 0) ? ret : (ret - 1);
+        result = i2c_smbus_write_i2c_block_data(client, 8 + off, count, buf);
+        if (result < 0) {
+                dev_err(&client->dev, "%s error %d\n", "nvram write", result);
+                return result;
+        }
+        return count;
 }
 
 static struct bin_attribute nvram = {
@@ -571,9 +533,11 @@ static int __devinit ds1307_probe(struct i2c_client *client,
         const struct chip_desc  *chip = &chips[id->driver_data];
         struct i2c_adapter      *adapter = to_i2c_adapter(client->dev.parent);
         int                     want_irq = false;
+        unsigned char           *buf;
 
         if (!i2c_check_functionality(adapter,
-                        I2C_FUNC_I2C | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
+                        I2C_FUNC_SMBUS_WRITE_BYTE_DATA |
+                        I2C_FUNC_SMBUS_I2C_BLOCK))
                 return -EIO;
 
         if (!(ds1307 = kzalloc(sizeof(struct ds1307), GFP_KERNEL)))
@@ -581,18 +545,8 @@ static int __devinit ds1307_probe(struct i2c_client *client,
 
         ds1307->client = client;
         i2c_set_clientdata(client, ds1307);
-
-        ds1307->msg[0].addr = client->addr;
-        ds1307->msg[0].flags = 0;
-        ds1307->msg[0].len = 1;
-        ds1307->msg[0].buf = &ds1307->reg_addr;
-
-        ds1307->msg[1].addr = client->addr;
-        ds1307->msg[1].flags = I2C_M_RD;
-        ds1307->msg[1].len = sizeof(ds1307->regs);
-        ds1307->msg[1].buf = ds1307->regs;
-
         ds1307->type = id->driver_data;
+        buf = ds1307->regs;
 
         switch (ds1307->type) {
         case ds_1337:
@@ -602,21 +556,15 @@ static int __devinit ds1307_probe(struct i2c_client *client,
                         INIT_WORK(&ds1307->work, ds1307_work);
                         want_irq = true;
                 }
-
-                ds1307->reg_addr = DS1337_REG_CONTROL;
-                ds1307->msg[1].len = 2;
-
                 /* get registers that the "rtc" read below won't read... */
-                tmp = i2c_transfer(adapter, ds1307->msg, 2);
+                tmp = i2c_smbus_read_i2c_block_data(ds1307->client,
+                                DS1337_REG_CONTROL, 2, buf);
                 if (tmp != 2) {
                         pr_debug("read error %d\n", tmp);
                         err = -EIO;
                         goto exit_free;
                 }
 
-                ds1307->reg_addr = 0;
-                ds1307->msg[1].len = sizeof(ds1307->regs);
-
                 /* oscillator off?  turn it on, so clock can tick. */
                 if (ds1307->regs[0] & DS1337_BIT_nEOSC)
                         ds1307->regs[0] &= ~DS1337_BIT_nEOSC;
@@ -647,9 +595,8 @@ static int __devinit ds1307_probe(struct i2c_client *client,
 
 read_rtc:
         /* read RTC registers */
-
-        tmp = i2c_transfer(adapter, ds1307->msg, 2);
-        if (tmp != 2) {
+        tmp = i2c_smbus_read_i2c_block_data(ds1307->client, 0, 8, buf);
+        if (tmp != 8) {
                 pr_debug("read error %d\n", tmp);
                 err = -EIO;
                 goto exit_free;
@@ -707,22 +654,6 @@ read_rtc:
                 break;
         }
 
-        tmp = ds1307->regs[DS1307_REG_SECS];
-        tmp = bcd2bin(tmp & 0x7f);
-        if (tmp > 60)
-                goto exit_bad;
-        tmp = bcd2bin(ds1307->regs[DS1307_REG_MIN] & 0x7f);
-        if (tmp > 60)
-                goto exit_bad;
-
-        tmp = bcd2bin(ds1307->regs[DS1307_REG_MDAY] & 0x3f);
-        if (tmp == 0 || tmp > 31)
-                goto exit_bad;
-
-        tmp = bcd2bin(ds1307->regs[DS1307_REG_MONTH] & 0x1f);
-        if (tmp == 0 || tmp > 12)
-                goto exit_bad;
-
         tmp = ds1307->regs[DS1307_REG_HOUR];
         switch (ds1307->type) {
         case ds_1340:
@@ -779,13 +710,6 @@ read_rtc:
 
         return 0;
 
-exit_bad:
-        dev_dbg(&client->dev, "%s: %02x %02x %02x %02x %02x %02x %02x\n",
-                        "bogus register",
-                        ds1307->regs[0], ds1307->regs[1],
-                        ds1307->regs[2], ds1307->regs[3],
-                        ds1307->regs[4], ds1307->regs[5],
-                        ds1307->regs[6]);
 exit_irq:
         if (ds1307->rtc)
                 rtc_device_unregister(ds1307->rtc);
diff --git a/drivers/rtc/rtc-parisc.c b/drivers/rtc/rtc-parisc.c
index 346d633655e7..c6bfa6fe1a2a 100644
--- a/drivers/rtc/rtc-parisc.c
+++ b/drivers/rtc/rtc-parisc.c
@@ -34,7 +34,8 @@ static int parisc_get_time(struct device *dev, struct rtc_time *tm)
 static int parisc_set_time(struct device *dev, struct rtc_time *tm)
 {
         struct parisc_rtc *p = dev_get_drvdata(dev);
-        unsigned long flags, ret;
+        unsigned long flags;
+        int ret;
 
         spin_lock_irqsave(&p->lock, flags);
         ret = set_rtc_time(tm);
diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c
new file mode 100644
index 000000000000..f4dd87e29075
--- /dev/null
+++ b/drivers/rtc/rtc-pcf50633.c
@@ -0,0 +1,344 @@
+/* NXP PCF50633 RTC Driver
+ *
+ * (C) 2006-2008 by Openmoko, Inc.
+ * Author: Balaji Rao <balajirrao@openmoko.org>
+ * All rights reserved.
+ *
+ * Broken down from monstrous PCF50633 driver mainly by
+ * Harald Welte, Andy Green and Werner Almesberger
+ *
+ *  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.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+#include <linux/err.h>
+
+#include <linux/mfd/pcf50633/core.h>
+
+#define PCF50633_REG_RTCSC      0x59 /* Second */
+#define PCF50633_REG_RTCMN      0x5a /* Minute */
+#define PCF50633_REG_RTCHR      0x5b /* Hour */
+#define PCF50633_REG_RTCWD      0x5c /* Weekday */
+#define PCF50633_REG_RTCDT      0x5d /* Day */
+#define PCF50633_REG_RTCMT      0x5e /* Month */
+#define PCF50633_REG_RTCYR      0x5f /* Year */
+#define PCF50633_REG_RTCSCA     0x60 /* Alarm Second */
+#define PCF50633_REG_RTCMNA     0x61 /* Alarm Minute */
+#define PCF50633_REG_RTCHRA     0x62 /* Alarm Hour */
+#define PCF50633_REG_RTCWDA     0x63 /* Alarm Weekday */
+#define PCF50633_REG_RTCDTA     0x64 /* Alarm Day */
+#define PCF50633_REG_RTCMTA     0x65 /* Alarm Month */
+#define PCF50633_REG_RTCYRA     0x66 /* Alarm Year */
+
+enum pcf50633_time_indexes {
+        PCF50633_TI_SEC,
+        PCF50633_TI_MIN,
+        PCF50633_TI_HOUR,
+        PCF50633_TI_WKDAY,
+        PCF50633_TI_DAY,
+        PCF50633_TI_MONTH,
+        PCF50633_TI_YEAR,
+        PCF50633_TI_EXTENT /* always last */
+};
+
+struct pcf50633_time {
+        u_int8_t time[PCF50633_TI_EXTENT];
+};
+
+struct pcf50633_rtc {
+        int alarm_enabled;
+        int second_enabled;
+
+        struct pcf50633 *pcf;
+        struct rtc_device *rtc_dev;
+};
+
+static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50633_time *pcf)
+{
+        rtc->tm_sec = bcd2bin(pcf->time[PCF50633_TI_SEC]);
+        rtc->tm_min = bcd2bin(pcf->time[PCF50633_TI_MIN]);
+        rtc->tm_hour = bcd2bin(pcf->time[PCF50633_TI_HOUR]);
+        rtc->tm_wday = bcd2bin(pcf->time[PCF50633_TI_WKDAY]);
+        rtc->tm_mday = bcd2bin(pcf->time[PCF50633_TI_DAY]);
+        rtc->tm_mon = bcd2bin(pcf->time[PCF50633_TI_MONTH]);
+        rtc->tm_year = bcd2bin(pcf->time[PCF50633_TI_YEAR]) + 100;
+}
+
+static void rtc2pcf_time(struct pcf50633_time *pcf, struct rtc_time *rtc)
+{
+        pcf->time[PCF50633_TI_SEC] = bin2bcd(rtc->tm_sec);
+        pcf->time[PCF50633_TI_MIN] = bin2bcd(rtc->tm_min);
+        pcf->time[PCF50633_TI_HOUR] = bin2bcd(rtc->tm_hour);
+        pcf->time[PCF50633_TI_WKDAY] = bin2bcd(rtc->tm_wday);
+        pcf->time[PCF50633_TI_DAY] = bin2bcd(rtc->tm_mday);
+        pcf->time[PCF50633_TI_MONTH] = bin2bcd(rtc->tm_mon);
+        pcf->time[PCF50633_TI_YEAR] = bin2bcd(rtc->tm_year % 100);
+}
+
+static int
+pcf50633_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct pcf50633_rtc *rtc = dev_get_drvdata(dev);
+        int err;
+
+        if (enabled)
+                err = pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
+        else
+                err = pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM);
+
+        if (err < 0)
+                return err;
+
+        rtc->alarm_enabled = enabled;
+
+        return 0;
+}
+
+static int
+pcf50633_rtc_update_irq_enable(struct device *dev, unsigned int enabled)
+{
+        struct pcf50633_rtc *rtc = dev_get_drvdata(dev);
+        int err;
+
+        if (enabled)
+                err = pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND);
+        else
+                err = pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND);
+
+        if (err < 0)
+                return err;
+
+        rtc->second_enabled = enabled;
+
+        return 0;
+}
+
+static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+        struct pcf50633_rtc *rtc;
+        struct pcf50633_time pcf_tm;
+        int ret;
+
+        rtc = dev_get_drvdata(dev);
+
+        ret = pcf50633_read_block(rtc->pcf, PCF50633_REG_RTCSC,
+                                            PCF50633_TI_EXTENT,
+                                            &pcf_tm.time[0]);
+        if (ret != PCF50633_TI_EXTENT) {
+                dev_err(dev, "Failed to read time\n");
+                return -EIO;
+        }
+
+        dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
+                pcf_tm.time[PCF50633_TI_DAY],
+                pcf_tm.time[PCF50633_TI_MONTH],
+                pcf_tm.time[PCF50633_TI_YEAR],
+                pcf_tm.time[PCF50633_TI_HOUR],
+                pcf_tm.time[PCF50633_TI_MIN],
+                pcf_tm.time[PCF50633_TI_SEC]);
+
+        pcf2rtc_time(tm, &pcf_tm);
+
+        dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
+                tm->tm_mday, tm->tm_mon, tm->tm_year,
+                tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+        return rtc_valid_tm(tm);
+}
+
+static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
+{
+        struct pcf50633_rtc *rtc;
+        struct pcf50633_time pcf_tm;
+        int second_masked, alarm_masked, ret = 0;
+
+        rtc = dev_get_drvdata(dev);
+
+        dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
+                tm->tm_mday, tm->tm_mon, tm->tm_year,
+                tm->tm_hour, tm->tm_min, tm->tm_sec);
+
+        rtc2pcf_time(&pcf_tm, tm);
+
+        dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
+                pcf_tm.time[PCF50633_TI_DAY],
+                pcf_tm.time[PCF50633_TI_MONTH],
+                pcf_tm.time[PCF50633_TI_YEAR],
+                pcf_tm.time[PCF50633_TI_HOUR],
+                pcf_tm.time[PCF50633_TI_MIN],
+                pcf_tm.time[PCF50633_TI_SEC]);
+
+
+        second_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_SECOND);
+        alarm_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_ALARM);
+
+        if (!second_masked)
+                pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_SECOND);
+        if (!alarm_masked)
+                pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM);
+
+        /* Returns 0 on success */
+        ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSC,
+                                             PCF50633_TI_EXTENT,
+                                             &pcf_tm.time[0]);
+
+        if (!second_masked)
+                pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_SECOND);
+        if (!alarm_masked)
+                pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
+
+        return ret;
+}
+
+static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct pcf50633_rtc *rtc;
+        struct pcf50633_time pcf_tm;
+        int ret = 0;
+
+        rtc = dev_get_drvdata(dev);
+
+        alrm->enabled = rtc->alarm_enabled;
+
+        ret = pcf50633_read_block(rtc->pcf, PCF50633_REG_RTCSCA,
+                                PCF50633_TI_EXTENT, &pcf_tm.time[0]);
+        if (ret != PCF50633_TI_EXTENT) {
+                dev_err(dev, "Failed to read time\n");
+                return -EIO;
+        }
+
+        pcf2rtc_time(&alrm->time, &pcf_tm);
+
+        return rtc_valid_tm(&alrm->time);
+}
+
+static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
+{
+        struct pcf50633_rtc *rtc;
+        struct pcf50633_time pcf_tm;
+        int alarm_masked, ret = 0;
+
+        rtc = dev_get_drvdata(dev);
+
+        rtc2pcf_time(&pcf_tm, &alrm->time);
+
+        /* do like mktime does and ignore tm_wday */
+        pcf_tm.time[PCF50633_TI_WKDAY] = 7;
+
+        alarm_masked = pcf50633_irq_mask_get(rtc->pcf, PCF50633_IRQ_ALARM);
+
+        /* disable alarm interrupt */
+        if (!alarm_masked)
+                pcf50633_irq_mask(rtc->pcf, PCF50633_IRQ_ALARM);
+
+        /* Returns 0 on success */
+        ret = pcf50633_write_block(rtc->pcf, PCF50633_REG_RTCSCA,
+                                PCF50633_TI_EXTENT, &pcf_tm.time[0]);
+
+        if (!alarm_masked)
+                pcf50633_irq_unmask(rtc->pcf, PCF50633_IRQ_ALARM);
+
+        return ret;
+}
+
+static struct rtc_class_ops pcf50633_rtc_ops = {
+        .read_time              = pcf50633_rtc_read_time,
+        .set_time               = pcf50633_rtc_set_time,
+        .read_alarm             = pcf50633_rtc_read_alarm,
+        .set_alarm              = pcf50633_rtc_set_alarm,
+        .alarm_irq_enable       = pcf50633_rtc_alarm_irq_enable,
+        .update_irq_enable      = pcf50633_rtc_update_irq_enable,
+};
+
+static void pcf50633_rtc_irq(int irq, void *data)
+{
+        struct pcf50633_rtc *rtc = data;
+
+        switch (irq) {
+        case PCF50633_IRQ_ALARM:
+                rtc_update_irq(rtc->rtc_dev, 1, RTC_AF | RTC_IRQF);
+                break;
+        case PCF50633_IRQ_SECOND:
+                rtc_update_irq(rtc->rtc_dev, 1, RTC_UF | RTC_IRQF);
+                break;
+        }
+}
+
+static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
+{
+        struct pcf50633_subdev_pdata *pdata;
+        struct pcf50633_rtc *rtc;
+
+
+        rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);
+        if (!rtc)
+                return -ENOMEM;
+
+        pdata = pdev->dev.platform_data;
+        rtc->pcf = pdata->pcf;
+        platform_set_drvdata(pdev, rtc);
+        rtc->rtc_dev = rtc_device_register("pcf50633-rtc", &pdev->dev,
+                                &pcf50633_rtc_ops, THIS_MODULE);
+
+        if (IS_ERR(rtc->rtc_dev)) {
+                kfree(rtc);
+                return PTR_ERR(rtc->rtc_dev);
+        }
+
+        pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_ALARM,
+                                        pcf50633_rtc_irq, rtc);
+        pcf50633_register_irq(rtc->pcf, PCF50633_IRQ_SECOND,
+                                        pcf50633_rtc_irq, rtc);
+
+        return 0;
+}
+
+static int __devexit pcf50633_rtc_remove(struct platform_device *pdev)
+{
+        struct pcf50633_rtc *rtc;
+
+        rtc = platform_get_drvdata(pdev);
+
+        pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_ALARM);
+        pcf50633_free_irq(rtc->pcf, PCF50633_IRQ_SECOND);
+
+        rtc_device_unregister(rtc->rtc_dev);
+        kfree(rtc);
+
+        return 0;
+}
+
+static struct platform_driver pcf50633_rtc_driver = {
+        .driver = {
+                .name = "pcf50633-rtc",
+        },
+        .probe = pcf50633_rtc_probe,
+        .remove = __devexit_p(pcf50633_rtc_remove),
+};
+
+static int __init pcf50633_rtc_init(void)
+{
+        return platform_driver_register(&pcf50633_rtc_driver);
+}
+module_init(pcf50633_rtc_init);
+
+static void __exit pcf50633_rtc_exit(void)
+{
+        platform_driver_unregister(&pcf50633_rtc_driver);
+}
+module_exit(pcf50633_rtc_exit);
+
+MODULE_DESCRIPTION("PCF50633 RTC driver");
+MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>");
+MODULE_LICENSE("GPL");
+