Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-pm8xxx.c
index 03f8f75d5af2267ae89c99e843d17ca0f60ff062..197699f358c7c18456d9ff7ab8130700001507a7 100644 (file)
@@ -9,18 +9,16 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-
+#include <linux/of.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/rtc.h>
+#include <linux/platform_device.h>
 #include <linux/pm.h>
+#include <linux/regmap.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 
-#include <linux/mfd/pm8xxx/core.h>
-#include <linux/mfd/pm8xxx/rtc.h>
-
-
 /* RTC Register offsets from RTC CTRL REG */
 #define PM8XXX_ALARM_CTRL_OFFSET       0x01
 #define PM8XXX_RTC_WRITE_OFFSET                0x02
@@ -37,6 +35,8 @@
 /**
  * struct pm8xxx_rtc -  rtc driver internal structure
  * @rtc:               rtc device for this driver.
+ * @regmap:            regmap used to access RTC registers
+ * @allow_set_time:    indicates whether writing to the RTC is allowed
  * @rtc_alarm_irq:     rtc alarm irq number.
  * @rtc_base:          address of rtc control register.
  * @rtc_read_base:     base address of read registers.
  */
 struct pm8xxx_rtc {
        struct rtc_device *rtc;
+       struct regmap *regmap;
+       bool allow_set_time;
        int rtc_alarm_irq;
        int rtc_base;
        int rtc_read_base;
        int rtc_write_base;
        int alarm_rw_base;
-       u8  ctrl_reg;
+       u8 ctrl_reg;
        struct device *rtc_dev;
        spinlock_t ctrl_reg_lock;
 };
 
-/*
- * The RTC registers need to be read/written one byte at a time. This is a
- * hardware limitation.
- */
-static int pm8xxx_read_wrapper(struct pm8xxx_rtc *rtc_dd, u8 *rtc_val,
-               int base, int count)
-{
-       int i, rc;
-       struct device *parent = rtc_dd->rtc_dev->parent;
-
-       for (i = 0; i < count; i++) {
-               rc = pm8xxx_readb(parent, base + i, &rtc_val[i]);
-               if (rc < 0) {
-                       dev_err(rtc_dd->rtc_dev, "PMIC read failed\n");
-                       return rc;
-               }
-       }
-
-       return 0;
-}
-
-static int pm8xxx_write_wrapper(struct pm8xxx_rtc *rtc_dd, u8 *rtc_val,
-               int base, int count)
-{
-       int i, rc;
-       struct device *parent = rtc_dd->rtc_dev->parent;
-
-       for (i = 0; i < count; i++) {
-               rc = pm8xxx_writeb(parent, base + i, rtc_val[i]);
-               if (rc < 0) {
-                       dev_err(rtc_dd->rtc_dev, "PMIC write failed\n");
-                       return rc;
-               }
-       }
-
-       return 0;
-}
-
 /*
  * Steps to write the RTC registers.
  * 1. Disable alarm if enabled.
@@ -107,9 +71,12 @@ static int pm8xxx_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
        int rc, i;
        unsigned long secs, irq_flags;
-       u8 value[NUM_8_BIT_RTC_REGS], reg = 0, alarm_enabled = 0, ctrl_reg;
+       u8 value[NUM_8_BIT_RTC_REGS], alarm_enabled = 0, ctrl_reg;
        struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev);
 
+       if (!rtc_dd->allow_set_time)
+               return -EACCES;
+
        rtc_tm_to_time(tm, &secs);
 
        for (i = 0; i < NUM_8_BIT_RTC_REGS; i++) {
@@ -125,47 +92,43 @@ static int pm8xxx_rtc_set_time(struct device *dev, struct rtc_time *tm)
        if (ctrl_reg & PM8xxx_RTC_ALARM_ENABLE) {
                alarm_enabled = 1;
                ctrl_reg &= ~PM8xxx_RTC_ALARM_ENABLE;
-               rc = pm8xxx_write_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base,
-                               1);
-               if (rc < 0) {
-                       dev_err(dev, "Write to RTC control register "
-                                                               "failed\n");
+               rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_base, ctrl_reg);
+               if (rc) {
+                       dev_err(dev, "Write to RTC control register failed\n");
                        goto rtc_rw_fail;
                }
                rtc_dd->ctrl_reg = ctrl_reg;
-       } else
+       } else {
                spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags);
+       }
 
        /* Write 0 to Byte[0] */
-       reg = 0;
-       rc = pm8xxx_write_wrapper(rtc_dd, &reg, rtc_dd->rtc_write_base, 1);
-       if (rc < 0) {
+       rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_write_base, 0);
+       if (rc) {
                dev_err(dev, "Write to RTC write data register failed\n");
                goto rtc_rw_fail;
        }
 
        /* Write Byte[1], Byte[2], Byte[3] */
-       rc = pm8xxx_write_wrapper(rtc_dd, value + 1,
-                                       rtc_dd->rtc_write_base + 1, 3);
-       if (rc < 0) {
+       rc = regmap_bulk_write(rtc_dd->regmap, rtc_dd->rtc_write_base + 1,
+                              &value[1], sizeof(value) - 1);
+       if (rc) {
                dev_err(dev, "Write to RTC write data register failed\n");
                goto rtc_rw_fail;
        }
 
        /* Write Byte[0] */
-       rc = pm8xxx_write_wrapper(rtc_dd, value, rtc_dd->rtc_write_base, 1);
-       if (rc < 0) {
+       rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_write_base, value[0]);
+       if (rc) {
                dev_err(dev, "Write to RTC write data register failed\n");
                goto rtc_rw_fail;
        }
 
        if (alarm_enabled) {
                ctrl_reg |= PM8xxx_RTC_ALARM_ENABLE;
-               rc = pm8xxx_write_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base,
-                                                                       1);
-               if (rc < 0) {
-                       dev_err(dev, "Write to RTC control register "
-                                                               "failed\n");
+               rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_base, ctrl_reg);
+               if (rc) {
+                       dev_err(dev, "Write to RTC control register failed\n");
                        goto rtc_rw_fail;
                }
                rtc_dd->ctrl_reg = ctrl_reg;
@@ -181,13 +144,14 @@ rtc_rw_fail:
 static int pm8xxx_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
        int rc;
-       u8 value[NUM_8_BIT_RTC_REGS], reg;
+       u8 value[NUM_8_BIT_RTC_REGS];
        unsigned long secs;
+       unsigned int reg;
        struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev);
 
-       rc = pm8xxx_read_wrapper(rtc_dd, value, rtc_dd->rtc_read_base,
-                                                       NUM_8_BIT_RTC_REGS);
-       if (rc < 0) {
+       rc = regmap_bulk_read(rtc_dd->regmap, rtc_dd->rtc_read_base,
+                             value, sizeof(value));
+       if (rc) {
                dev_err(dev, "RTC read data register failed\n");
                return rc;
        }
@@ -196,16 +160,16 @@ static int pm8xxx_rtc_read_time(struct device *dev, struct rtc_time *tm)
         * Read the LSB again and check if there has been a carry over.
         * If there is, redo the read operation.
         */
-       rc = pm8xxx_read_wrapper(rtc_dd, &reg, rtc_dd->rtc_read_base, 1);
+       rc = regmap_read(rtc_dd->regmap, rtc_dd->rtc_read_base, &reg);
        if (rc < 0) {
                dev_err(dev, "RTC read data register failed\n");
                return rc;
        }
 
        if (unlikely(reg < value[0])) {
-               rc = pm8xxx_read_wrapper(rtc_dd, value,
-                               rtc_dd->rtc_read_base, NUM_8_BIT_RTC_REGS);
-               if (rc < 0) {
+               rc = regmap_bulk_read(rtc_dd->regmap, rtc_dd->rtc_read_base,
+                                     value, sizeof(value));
+               if (rc) {
                        dev_err(dev, "RTC read data register failed\n");
                        return rc;
                }
@@ -222,8 +186,8 @@ static int pm8xxx_rtc_read_time(struct device *dev, struct rtc_time *tm)
        }
 
        dev_dbg(dev, "secs = %lu, h:m:s == %d:%d:%d, d/m/y = %d/%d/%d\n",
-                               secs, tm->tm_hour, tm->tm_min, tm->tm_sec,
-                               tm->tm_mday, tm->tm_mon, tm->tm_year);
+               secs, tm->tm_hour, tm->tm_min, tm->tm_sec,
+               tm->tm_mday, tm->tm_mon, tm->tm_year);
 
        return 0;
 }
@@ -244,19 +208,22 @@ static int pm8xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
 
        spin_lock_irqsave(&rtc_dd->ctrl_reg_lock, irq_flags);
 
-       rc = pm8xxx_write_wrapper(rtc_dd, value, rtc_dd->alarm_rw_base,
-                                                       NUM_8_BIT_RTC_REGS);
-       if (rc < 0) {
+       rc = regmap_bulk_write(rtc_dd->regmap, rtc_dd->alarm_rw_base, value,
+                              sizeof(value));
+       if (rc) {
                dev_err(dev, "Write to RTC ALARM register failed\n");
                goto rtc_rw_fail;
        }
 
        ctrl_reg = rtc_dd->ctrl_reg;
-       ctrl_reg = alarm->enabled ? (ctrl_reg | PM8xxx_RTC_ALARM_ENABLE) :
-                                       (ctrl_reg & ~PM8xxx_RTC_ALARM_ENABLE);
 
-       rc = pm8xxx_write_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base, 1);
-       if (rc < 0) {
+       if (alarm->enabled)
+               ctrl_reg |= PM8xxx_RTC_ALARM_ENABLE;
+       else
+               ctrl_reg &= ~PM8xxx_RTC_ALARM_ENABLE;
+
+       rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_base, ctrl_reg);
+       if (rc) {
                dev_err(dev, "Write to RTC control register failed\n");
                goto rtc_rw_fail;
        }
@@ -264,9 +231,9 @@ static int pm8xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
        rtc_dd->ctrl_reg = ctrl_reg;
 
        dev_dbg(dev, "Alarm Set for h:r:s=%d:%d:%d, d/m/y=%d/%d/%d\n",
-                               alarm->time.tm_hour, alarm->time.tm_min,
-                               alarm->time.tm_sec, alarm->time.tm_mday,
-                               alarm->time.tm_mon, alarm->time.tm_year);
+               alarm->time.tm_hour, alarm->time.tm_min,
+               alarm->time.tm_sec, alarm->time.tm_mday,
+               alarm->time.tm_mon, alarm->time.tm_year);
 rtc_rw_fail:
        spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags);
        return rc;
@@ -279,9 +246,9 @@ static int pm8xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
        unsigned long secs;
        struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev);
 
-       rc = pm8xxx_read_wrapper(rtc_dd, value, rtc_dd->alarm_rw_base,
-                       NUM_8_BIT_RTC_REGS);
-       if (rc < 0) {
+       rc = regmap_bulk_read(rtc_dd->regmap, rtc_dd->alarm_rw_base, value,
+                             sizeof(value));
+       if (rc) {
                dev_err(dev, "RTC alarm time read failed\n");
                return rc;
        }
@@ -297,9 +264,9 @@ static int pm8xxx_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm)
        }
 
        dev_dbg(dev, "Alarm set for - h:r:s=%d:%d:%d, d/m/y=%d/%d/%d\n",
-                               alarm->time.tm_hour, alarm->time.tm_min,
-                               alarm->time.tm_sec, alarm->time.tm_mday,
-                               alarm->time.tm_mon, alarm->time.tm_year);
+               alarm->time.tm_hour, alarm->time.tm_min,
+               alarm->time.tm_sec, alarm->time.tm_mday,
+               alarm->time.tm_mon, alarm->time.tm_year);
 
        return 0;
 }
@@ -312,12 +279,16 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable)
        u8 ctrl_reg;
 
        spin_lock_irqsave(&rtc_dd->ctrl_reg_lock, irq_flags);
+
        ctrl_reg = rtc_dd->ctrl_reg;
-       ctrl_reg = (enable) ? (ctrl_reg | PM8xxx_RTC_ALARM_ENABLE) :
-                               (ctrl_reg & ~PM8xxx_RTC_ALARM_ENABLE);
 
-       rc = pm8xxx_write_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base, 1);
-       if (rc < 0) {
+       if (enable)
+               ctrl_reg |= PM8xxx_RTC_ALARM_ENABLE;
+       else
+               ctrl_reg &= ~PM8xxx_RTC_ALARM_ENABLE;
+
+       rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_base, ctrl_reg);
+       if (rc) {
                dev_err(dev, "Write to RTC control register failed\n");
                goto rtc_rw_fail;
        }
@@ -329,8 +300,9 @@ rtc_rw_fail:
        return rc;
 }
 
-static struct rtc_class_ops pm8xxx_rtc_ops = {
+static const struct rtc_class_ops pm8xxx_rtc_ops = {
        .read_time      = pm8xxx_rtc_read_time,
+       .set_time       = pm8xxx_rtc_set_time,
        .set_alarm      = pm8xxx_rtc_set_alarm,
        .read_alarm     = pm8xxx_rtc_read_alarm,
        .alarm_irq_enable = pm8xxx_rtc_alarm_irq_enable,
@@ -339,7 +311,7 @@ static struct rtc_class_ops pm8xxx_rtc_ops = {
 static irqreturn_t pm8xxx_alarm_trigger(int irq, void *dev_id)
 {
        struct pm8xxx_rtc *rtc_dd = dev_id;
-       u8 ctrl_reg;
+       unsigned int ctrl_reg;
        int rc;
        unsigned long irq_flags;
 
@@ -351,11 +323,11 @@ static irqreturn_t pm8xxx_alarm_trigger(int irq, void *dev_id)
        ctrl_reg = rtc_dd->ctrl_reg;
        ctrl_reg &= ~PM8xxx_RTC_ALARM_ENABLE;
 
-       rc = pm8xxx_write_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base, 1);
-       if (rc < 0) {
+       rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_base, ctrl_reg);
+       if (rc) {
                spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags);
-               dev_err(rtc_dd->rtc_dev, "Write to RTC control register "
-                                                               "failed\n");
+               dev_err(rtc_dd->rtc_dev,
+                       "Write to RTC control register failed\n");
                goto rtc_alarm_handled;
        }
 
@@ -363,61 +335,71 @@ static irqreturn_t pm8xxx_alarm_trigger(int irq, void *dev_id)
        spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags);
 
        /* Clear RTC alarm register */
-       rc = pm8xxx_read_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base +
-                                               PM8XXX_ALARM_CTRL_OFFSET, 1);
-       if (rc < 0) {
-               dev_err(rtc_dd->rtc_dev, "RTC Alarm control register read "
-                                                               "failed\n");
+       rc = regmap_read(rtc_dd->regmap,
+                        rtc_dd->rtc_base + PM8XXX_ALARM_CTRL_OFFSET,
+                        &ctrl_reg);
+       if (rc) {
+               dev_err(rtc_dd->rtc_dev,
+                       "RTC Alarm control register read failed\n");
                goto rtc_alarm_handled;
        }
 
        ctrl_reg &= ~PM8xxx_RTC_ALARM_CLEAR;
-       rc = pm8xxx_write_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base +
-                                               PM8XXX_ALARM_CTRL_OFFSET, 1);
-       if (rc < 0)
-               dev_err(rtc_dd->rtc_dev, "Write to RTC Alarm control register"
-                                                               " failed\n");
+       rc = regmap_write(rtc_dd->regmap,
+                         rtc_dd->rtc_base + PM8XXX_ALARM_CTRL_OFFSET,
+                         ctrl_reg);
+       if (rc)
+               dev_err(rtc_dd->rtc_dev,
+                       "Write to RTC Alarm control register failed\n");
 
 rtc_alarm_handled:
        return IRQ_HANDLED;
 }
 
+/*
+ * Hardcoded RTC bases until IORESOURCE_REG mapping is figured out
+ */
+static const struct of_device_id pm8xxx_id_table[] = {
+       { .compatible = "qcom,pm8921-rtc", .data = (void *) 0x11D },
+       { .compatible = "qcom,pm8058-rtc", .data = (void *) 0x1E8 },
+       { },
+};
+MODULE_DEVICE_TABLE(of, pm8xxx_id_table);
+
 static int pm8xxx_rtc_probe(struct platform_device *pdev)
 {
        int rc;
-       u8 ctrl_reg;
-       bool rtc_write_enable = false;
+       unsigned int ctrl_reg;
        struct pm8xxx_rtc *rtc_dd;
-       struct resource *rtc_resource;
-       const struct pm8xxx_rtc_platform_data *pdata =
-                                               dev_get_platdata(&pdev->dev);
+       const struct of_device_id *match;
 
-       if (pdata != NULL)
-               rtc_write_enable = pdata->rtc_write_enable;
+       match = of_match_node(pm8xxx_id_table, pdev->dev.of_node);
+       if (!match)
+               return -ENXIO;
 
        rtc_dd = devm_kzalloc(&pdev->dev, sizeof(*rtc_dd), GFP_KERNEL);
-       if (rtc_dd == NULL) {
-               dev_err(&pdev->dev, "Unable to allocate memory!\n");
+       if (rtc_dd == NULL)
                return -ENOMEM;
-       }
 
        /* Initialise spinlock to protect RTC control register */
        spin_lock_init(&rtc_dd->ctrl_reg_lock);
 
+       rtc_dd->regmap = dev_get_regmap(pdev->dev.parent, NULL);
+       if (!rtc_dd->regmap) {
+               dev_err(&pdev->dev, "Parent regmap unavailable.\n");
+               return -ENXIO;
+       }
+
        rtc_dd->rtc_alarm_irq = platform_get_irq(pdev, 0);
        if (rtc_dd->rtc_alarm_irq < 0) {
                dev_err(&pdev->dev, "Alarm IRQ resource absent!\n");
                return -ENXIO;
        }
 
-       rtc_resource = platform_get_resource_byname(pdev, IORESOURCE_IO,
-                                                       "pmic_rtc_base");
-       if (!(rtc_resource && rtc_resource->start)) {
-               dev_err(&pdev->dev, "RTC IO resource absent!\n");
-               return -ENXIO;
-       }
+       rtc_dd->allow_set_time = of_property_read_bool(pdev->dev.of_node,
+                                                     "allow-set-time");
 
-       rtc_dd->rtc_base = rtc_resource->start;
+       rtc_dd->rtc_base = (long) match->data;
 
        /* Setup RTC register addresses */
        rtc_dd->rtc_write_base = rtc_dd->rtc_base + PM8XXX_RTC_WRITE_OFFSET;
@@ -427,64 +409,52 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
        rtc_dd->rtc_dev = &pdev->dev;
 
        /* Check if the RTC is on, else turn it on */
-       rc = pm8xxx_read_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base, 1);
-       if (rc < 0) {
+       rc = regmap_read(rtc_dd->regmap, rtc_dd->rtc_base, &ctrl_reg);
+       if (rc) {
                dev_err(&pdev->dev, "RTC control register read failed!\n");
                return rc;
        }
 
        if (!(ctrl_reg & PM8xxx_RTC_ENABLE)) {
                ctrl_reg |= PM8xxx_RTC_ENABLE;
-               rc = pm8xxx_write_wrapper(rtc_dd, &ctrl_reg, rtc_dd->rtc_base,
-                                                                       1);
-               if (rc < 0) {
-                       dev_err(&pdev->dev, "Write to RTC control register "
-                                                               "failed\n");
+               rc = regmap_write(rtc_dd->regmap, rtc_dd->rtc_base, ctrl_reg);
+               if (rc) {
+                       dev_err(&pdev->dev,
+                               "Write to RTC control register failed\n");
                        return rc;
                }
        }
 
        rtc_dd->ctrl_reg = ctrl_reg;
-       if (rtc_write_enable == true)
-               pm8xxx_rtc_ops.set_time = pm8xxx_rtc_set_time;
 
        platform_set_drvdata(pdev, rtc_dd);
 
+       device_init_wakeup(&pdev->dev, 1);
+
        /* Register the RTC device */
        rtc_dd->rtc = devm_rtc_device_register(&pdev->dev, "pm8xxx_rtc",
-                               &pm8xxx_rtc_ops, THIS_MODULE);
+                                              &pm8xxx_rtc_ops, THIS_MODULE);
        if (IS_ERR(rtc_dd->rtc)) {
                dev_err(&pdev->dev, "%s: RTC registration failed (%ld)\n",
-                                       __func__, PTR_ERR(rtc_dd->rtc));
+                       __func__, PTR_ERR(rtc_dd->rtc));
                return PTR_ERR(rtc_dd->rtc);
        }
 
        /* Request the alarm IRQ */
-       rc = request_any_context_irq(rtc_dd->rtc_alarm_irq,
-                                pm8xxx_alarm_trigger, IRQF_TRIGGER_RISING,
-                                "pm8xxx_rtc_alarm", rtc_dd);
+       rc = devm_request_any_context_irq(&pdev->dev, rtc_dd->rtc_alarm_irq,
+                                         pm8xxx_alarm_trigger,
+                                         IRQF_TRIGGER_RISING,
+                                         "pm8xxx_rtc_alarm", rtc_dd);
        if (rc < 0) {
                dev_err(&pdev->dev, "Request IRQ failed (%d)\n", rc);
                return rc;
        }
 
-       device_init_wakeup(&pdev->dev, 1);
-
        dev_dbg(&pdev->dev, "Probe success !!\n");
 
        return 0;
 }
 
-static int pm8xxx_rtc_remove(struct platform_device *pdev)
-{
-       struct pm8xxx_rtc *rtc_dd = platform_get_drvdata(pdev);
-
-       device_init_wakeup(&pdev->dev, 0);
-       free_irq(rtc_dd->rtc_alarm_irq, rtc_dd);
-
-       return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int pm8xxx_rtc_resume(struct device *dev)
 {
@@ -507,15 +477,17 @@ static int pm8xxx_rtc_suspend(struct device *dev)
 }
 #endif
 
-static SIMPLE_DEV_PM_OPS(pm8xxx_rtc_pm_ops, pm8xxx_rtc_suspend, pm8xxx_rtc_resume);
+static SIMPLE_DEV_PM_OPS(pm8xxx_rtc_pm_ops,
+                        pm8xxx_rtc_suspend,
+                        pm8xxx_rtc_resume);
 
 static struct platform_driver pm8xxx_rtc_driver = {
        .probe          = pm8xxx_rtc_probe,
-       .remove         = pm8xxx_rtc_remove,
        .driver = {
-               .name   = PM8XXX_RTC_DEV_NAME,
-               .owner  = THIS_MODULE,
-               .pm     = &pm8xxx_rtc_pm_ops,
+               .name           = "rtc-pm8xxx",
+               .owner          = THIS_MODULE,
+               .pm             = &pm8xxx_rtc_pm_ops,
+               .of_match_table = pm8xxx_id_table,
        },
 };