1 files changed, 349 insertions, 198 deletions

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 21142e6574a9..4f1c6ca97211 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -1,10 +1,11 @@
 /*
- * TI OMAP1 Real Time Clock interface for Linux
+ * TI OMAP Real Time Clock interface for Linux
  *
  * Copyright (C) 2003 MontaVista Software, Inc.
  * Author: George G. Davis <gdavis@mvista.com> or <source@mvista.com>
  *
  * Copyright (C) 2006 David Brownell (new RTC framework)
+ * Copyright (C) 2014 Johan Hovold <johan@kernel.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,7 +26,8 @@
 #include <linux/pm_runtime.h>
 #include <linux/io.h>
 
-/* The OMAP1 RTC is a year/month/day/hours/minutes/seconds BCD clock
+/*
+ * The OMAP RTC is a year/month/day/hours/minutes/seconds BCD clock
  * with century-range alarm matching, driven by the 32kHz clock.
  *
  * The main user-visible ways it differs from PC RTCs are by omitting
@@ -39,10 +41,6 @@
  * the SoC). See the BOARD-SPECIFIC CUSTOMIZATION comment.
  */
 
-#define DRIVER_NAME                     "omap_rtc"
-
-#define OMAP_RTC_BASE                   0xfffb4800
-
 /* RTC registers */
 #define OMAP_RTC_SECONDS_REG            0x00
 #define OMAP_RTC_MINUTES_REG            0x04
@@ -72,6 +70,15 @@
 
 #define OMAP_RTC_IRQWAKEEN              0x7c
 
+#define OMAP_RTC_ALARM2_SECONDS_REG     0x80
+#define OMAP_RTC_ALARM2_MINUTES_REG     0x84
+#define OMAP_RTC_ALARM2_HOURS_REG       0x88
+#define OMAP_RTC_ALARM2_DAYS_REG        0x8c
+#define OMAP_RTC_ALARM2_MONTHS_REG      0x90
+#define OMAP_RTC_ALARM2_YEARS_REG       0x94
+
+#define OMAP_RTC_PMIC_REG               0x98
+
 /* OMAP_RTC_CTRL_REG bit fields: */
 #define OMAP_RTC_CTRL_SPLIT             BIT(7)
 #define OMAP_RTC_CTRL_DISABLE           BIT(6)
@@ -84,6 +91,7 @@
 
 /* OMAP_RTC_STATUS_REG bit fields: */
 #define OMAP_RTC_STATUS_POWER_UP        BIT(7)
+#define OMAP_RTC_STATUS_ALARM2          BIT(7)
 #define OMAP_RTC_STATUS_ALARM           BIT(6)
 #define OMAP_RTC_STATUS_1D_EVENT        BIT(5)
 #define OMAP_RTC_STATUS_1H_EVENT        BIT(4)
@@ -93,6 +101,7 @@
 #define OMAP_RTC_STATUS_BUSY            BIT(0)
 
 /* OMAP_RTC_INTERRUPTS_REG bit fields: */
+#define OMAP_RTC_INTERRUPTS_IT_ALARM2   BIT(4)
 #define OMAP_RTC_INTERRUPTS_IT_ALARM    BIT(3)
 #define OMAP_RTC_INTERRUPTS_IT_TIMER    BIT(2)
 
@@ -102,61 +111,82 @@
 /* OMAP_RTC_IRQWAKEEN bit fields: */
 #define OMAP_RTC_IRQWAKEEN_ALARM_WAKEEN BIT(1)
 
+/* OMAP_RTC_PMIC bit fields: */
+#define OMAP_RTC_PMIC_POWER_EN_EN       BIT(16)
+
 /* OMAP_RTC_KICKER values */
 #define KICK0_VALUE                     0x83e70b13
 #define KICK1_VALUE                     0x95a4f1e0
 
-#define OMAP_RTC_HAS_KICKER             BIT(0)
-
-/*
- * Few RTC IP revisions has special WAKE-EN Register to enable Wakeup
- * generation for event Alarm.
- */
-#define OMAP_RTC_HAS_IRQWAKEEN          BIT(1)
+struct omap_rtc_device_type {
+        bool has_32kclk_en;
+        bool has_kicker;
+        bool has_irqwakeen;
+        bool has_pmic_mode;
+        bool has_power_up_reset;
+};
 
-/*
- * Some RTC IP revisions (like those in AM335x and DRA7x) need
- * the 32KHz clock to be explicitly enabled.
- */
-#define OMAP_RTC_HAS_32KCLK_EN          BIT(2)
+struct omap_rtc {
+        struct rtc_device *rtc;
+        void __iomem *base;
+        int irq_alarm;
+        int irq_timer;
+        u8 interrupts_reg;
+        bool is_pmic_controller;
+        const struct omap_rtc_device_type *type;
+};
 
-static void __iomem     *rtc_base;
+static inline u8 rtc_read(struct omap_rtc *rtc, unsigned int reg)
+{
+        return readb(rtc->base + reg);
+}
 
-#define rtc_read(addr)          readb(rtc_base + (addr))
-#define rtc_write(val, addr)    writeb(val, rtc_base + (addr))
+static inline u32 rtc_readl(struct omap_rtc *rtc, unsigned int reg)
+{
+        return readl(rtc->base + reg);
+}
 
-#define rtc_writel(val, addr)   writel(val, rtc_base + (addr))
+static inline void rtc_write(struct omap_rtc *rtc, unsigned int reg, u8 val)
+{
+        writeb(val, rtc->base + reg);
+}
 
+static inline void rtc_writel(struct omap_rtc *rtc, unsigned int reg, u32 val)
+{
+        writel(val, rtc->base + reg);
+}
 
-/* we rely on the rtc framework to handle locking (rtc->ops_lock),
+/*
+ * We rely on the rtc framework to handle locking (rtc->ops_lock),
  * so the only other requirement is that register accesses which
  * require BUSY to be clear are made with IRQs locally disabled
  */
-static void rtc_wait_not_busy(void)
+static void rtc_wait_not_busy(struct omap_rtc *rtc)
 {
-        int     count = 0;
-        u8      status;
+        int count;
+        u8 status;
 
         /* BUSY may stay active for 1/32768 second (~30 usec) */
         for (count = 0; count < 50; count++) {
-                status = rtc_read(OMAP_RTC_STATUS_REG);
-                if ((status & (u8)OMAP_RTC_STATUS_BUSY) == 0)
+                status = rtc_read(rtc, OMAP_RTC_STATUS_REG);
+                if (!(status & OMAP_RTC_STATUS_BUSY))
                         break;
                 udelay(1);
         }
         /* now we have ~15 usec to read/write various registers */
 }
 
-static irqreturn_t rtc_irq(int irq, void *rtc)
+static irqreturn_t rtc_irq(int irq, void *dev_id)
 {
-        unsigned long           events = 0;
-        u8                      irq_data;
+        struct omap_rtc *rtc = dev_id;
+        unsigned long events = 0;
+        u8 irq_data;
 
-        irq_data = rtc_read(OMAP_RTC_STATUS_REG);
+        irq_data = rtc_read(rtc, OMAP_RTC_STATUS_REG);
 
         /* alarm irq? */
         if (irq_data & OMAP_RTC_STATUS_ALARM) {
-                rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG);
+                rtc_write(rtc, OMAP_RTC_STATUS_REG, OMAP_RTC_STATUS_ALARM);
                 events |= RTC_IRQF | RTC_AF;
         }
 
@@ -164,23 +194,21 @@ static irqreturn_t rtc_irq(int irq, void *rtc)
         if (irq_data & OMAP_RTC_STATUS_1S_EVENT)
                 events |= RTC_IRQF | RTC_UF;
 
-        rtc_update_irq(rtc, 1, events);
+        rtc_update_irq(rtc->rtc, 1, events);
 
         return IRQ_HANDLED;
 }
 
 static int omap_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
         u8 reg, irqwake_reg = 0;
-        struct platform_device *pdev = to_platform_device(dev);
-        const struct platform_device_id *id_entry =
-                                        platform_get_device_id(pdev);
 
         local_irq_disable();
-        rtc_wait_not_busy();
-        reg = rtc_read(OMAP_RTC_INTERRUPTS_REG);
-        if (id_entry->driver_data & OMAP_RTC_HAS_IRQWAKEEN)
-                irqwake_reg = rtc_read(OMAP_RTC_IRQWAKEEN);
+        rtc_wait_not_busy(rtc);
+        reg = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
+        if (rtc->type->has_irqwakeen)
+                irqwake_reg = rtc_read(rtc, OMAP_RTC_IRQWAKEEN);
 
         if (enabled) {
                 reg |= OMAP_RTC_INTERRUPTS_IT_ALARM;
@@ -189,10 +217,10 @@ static int omap_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
                 reg &= ~OMAP_RTC_INTERRUPTS_IT_ALARM;
                 irqwake_reg &= ~OMAP_RTC_IRQWAKEEN_ALARM_WAKEEN;
         }
-        rtc_wait_not_busy();
-        rtc_write(reg, OMAP_RTC_INTERRUPTS_REG);
-        if (id_entry->driver_data & OMAP_RTC_HAS_IRQWAKEEN)
-                rtc_write(irqwake_reg, OMAP_RTC_IRQWAKEEN);
+        rtc_wait_not_busy(rtc);
+        rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, reg);
+        if (rtc->type->has_irqwakeen)
+                rtc_write(rtc, OMAP_RTC_IRQWAKEEN, irqwake_reg);
         local_irq_enable();
 
         return 0;
@@ -230,39 +258,47 @@ static void bcd2tm(struct rtc_time *tm)
         tm->tm_year = bcd2bin(tm->tm_year) + 100;
 }
 
+static void omap_rtc_read_time_raw(struct omap_rtc *rtc, struct rtc_time *tm)
+{
+        tm->tm_sec = rtc_read(rtc, OMAP_RTC_SECONDS_REG);
+        tm->tm_min = rtc_read(rtc, OMAP_RTC_MINUTES_REG);
+        tm->tm_hour = rtc_read(rtc, OMAP_RTC_HOURS_REG);
+        tm->tm_mday = rtc_read(rtc, OMAP_RTC_DAYS_REG);
+        tm->tm_mon = rtc_read(rtc, OMAP_RTC_MONTHS_REG);
+        tm->tm_year = rtc_read(rtc, OMAP_RTC_YEARS_REG);
+}
 
 static int omap_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
+
         /* we don't report wday/yday/isdst ... */
         local_irq_disable();
-        rtc_wait_not_busy();
-
-        tm->tm_sec = rtc_read(OMAP_RTC_SECONDS_REG);
-        tm->tm_min = rtc_read(OMAP_RTC_MINUTES_REG);
-        tm->tm_hour = rtc_read(OMAP_RTC_HOURS_REG);
-        tm->tm_mday = rtc_read(OMAP_RTC_DAYS_REG);
-        tm->tm_mon = rtc_read(OMAP_RTC_MONTHS_REG);
-        tm->tm_year = rtc_read(OMAP_RTC_YEARS_REG);
-
+        rtc_wait_not_busy(rtc);
+        omap_rtc_read_time_raw(rtc, tm);
         local_irq_enable();
 
         bcd2tm(tm);
+
         return 0;
 }
 
 static int omap_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
+
         if (tm2bcd(tm) < 0)
                 return -EINVAL;
+
         local_irq_disable();
-        rtc_wait_not_busy();
+        rtc_wait_not_busy(rtc);
 
-        rtc_write(tm->tm_year, OMAP_RTC_YEARS_REG);
-        rtc_write(tm->tm_mon, OMAP_RTC_MONTHS_REG);
-        rtc_write(tm->tm_mday, OMAP_RTC_DAYS_REG);
-        rtc_write(tm->tm_hour, OMAP_RTC_HOURS_REG);
-        rtc_write(tm->tm_min, OMAP_RTC_MINUTES_REG);
-        rtc_write(tm->tm_sec, OMAP_RTC_SECONDS_REG);
+        rtc_write(rtc, OMAP_RTC_YEARS_REG, tm->tm_year);
+        rtc_write(rtc, OMAP_RTC_MONTHS_REG, tm->tm_mon);
+        rtc_write(rtc, OMAP_RTC_DAYS_REG, tm->tm_mday);
+        rtc_write(rtc, OMAP_RTC_HOURS_REG, tm->tm_hour);
+        rtc_write(rtc, OMAP_RTC_MINUTES_REG, tm->tm_min);
+        rtc_write(rtc, OMAP_RTC_SECONDS_REG, tm->tm_sec);
 
         local_irq_enable();
 
@@ -271,48 +307,50 @@ static int omap_rtc_set_time(struct device *dev, struct rtc_time *tm)
 
 static int omap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
+        u8 interrupts;
+
         local_irq_disable();
-        rtc_wait_not_busy();
+        rtc_wait_not_busy(rtc);
 
-        alm->time.tm_sec = rtc_read(OMAP_RTC_ALARM_SECONDS_REG);
-        alm->time.tm_min = rtc_read(OMAP_RTC_ALARM_MINUTES_REG);
-        alm->time.tm_hour = rtc_read(OMAP_RTC_ALARM_HOURS_REG);
-        alm->time.tm_mday = rtc_read(OMAP_RTC_ALARM_DAYS_REG);
-        alm->time.tm_mon = rtc_read(OMAP_RTC_ALARM_MONTHS_REG);
-        alm->time.tm_year = rtc_read(OMAP_RTC_ALARM_YEARS_REG);
+        alm->time.tm_sec = rtc_read(rtc, OMAP_RTC_ALARM_SECONDS_REG);
+        alm->time.tm_min = rtc_read(rtc, OMAP_RTC_ALARM_MINUTES_REG);
+        alm->time.tm_hour = rtc_read(rtc, OMAP_RTC_ALARM_HOURS_REG);
+        alm->time.tm_mday = rtc_read(rtc, OMAP_RTC_ALARM_DAYS_REG);
+        alm->time.tm_mon = rtc_read(rtc, OMAP_RTC_ALARM_MONTHS_REG);
+        alm->time.tm_year = rtc_read(rtc, OMAP_RTC_ALARM_YEARS_REG);
 
         local_irq_enable();
 
         bcd2tm(&alm->time);
-        alm->enabled = !!(rtc_read(OMAP_RTC_INTERRUPTS_REG)
-                        & OMAP_RTC_INTERRUPTS_IT_ALARM);
+
+        interrupts = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
+        alm->enabled = !!(interrupts & OMAP_RTC_INTERRUPTS_IT_ALARM);
 
         return 0;
 }
 
 static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
 {
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
         u8 reg, irqwake_reg = 0;
-        struct platform_device *pdev = to_platform_device(dev);
-        const struct platform_device_id *id_entry =
-                                        platform_get_device_id(pdev);
 
         if (tm2bcd(&alm->time) < 0)
                 return -EINVAL;
 
         local_irq_disable();
-        rtc_wait_not_busy();
+        rtc_wait_not_busy(rtc);
 
-        rtc_write(alm->time.tm_year, OMAP_RTC_ALARM_YEARS_REG);
-        rtc_write(alm->time.tm_mon, OMAP_RTC_ALARM_MONTHS_REG);
-        rtc_write(alm->time.tm_mday, OMAP_RTC_ALARM_DAYS_REG);
-        rtc_write(alm->time.tm_hour, OMAP_RTC_ALARM_HOURS_REG);
-        rtc_write(alm->time.tm_min, OMAP_RTC_ALARM_MINUTES_REG);
-        rtc_write(alm->time.tm_sec, OMAP_RTC_ALARM_SECONDS_REG);
+        rtc_write(rtc, OMAP_RTC_ALARM_YEARS_REG, alm->time.tm_year);
+        rtc_write(rtc, OMAP_RTC_ALARM_MONTHS_REG, alm->time.tm_mon);
+        rtc_write(rtc, OMAP_RTC_ALARM_DAYS_REG, alm->time.tm_mday);
+        rtc_write(rtc, OMAP_RTC_ALARM_HOURS_REG, alm->time.tm_hour);
+        rtc_write(rtc, OMAP_RTC_ALARM_MINUTES_REG, alm->time.tm_min);
+        rtc_write(rtc, OMAP_RTC_ALARM_SECONDS_REG, alm->time.tm_sec);
 
-        reg = rtc_read(OMAP_RTC_INTERRUPTS_REG);
-        if (id_entry->driver_data & OMAP_RTC_HAS_IRQWAKEEN)
-                irqwake_reg = rtc_read(OMAP_RTC_IRQWAKEEN);
+        reg = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
+        if (rtc->type->has_irqwakeen)
+                irqwake_reg = rtc_read(rtc, OMAP_RTC_IRQWAKEEN);
 
         if (alm->enabled) {
                 reg |= OMAP_RTC_INTERRUPTS_IT_ALARM;
@@ -321,15 +359,79 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
                 reg &= ~OMAP_RTC_INTERRUPTS_IT_ALARM;
                 irqwake_reg &= ~OMAP_RTC_IRQWAKEEN_ALARM_WAKEEN;
         }
-        rtc_write(reg, OMAP_RTC_INTERRUPTS_REG);
-        if (id_entry->driver_data & OMAP_RTC_HAS_IRQWAKEEN)
-                rtc_write(irqwake_reg, OMAP_RTC_IRQWAKEEN);
+        rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, reg);
+        if (rtc->type->has_irqwakeen)
+                rtc_write(rtc, OMAP_RTC_IRQWAKEEN, irqwake_reg);
 
         local_irq_enable();
 
         return 0;
 }
 
+static struct omap_rtc *omap_rtc_power_off_rtc;
+
+/*
+ * omap_rtc_poweroff: RTC-controlled power off
+ *
+ * The RTC can be used to control an external PMIC via the pmic_power_en pin,
+ * which can be configured to transition to OFF on ALARM2 events.
+ *
+ * Notes:
+ * The two-second alarm offset is the shortest offset possible as the alarm
+ * registers must be set before the next timer update and the offset
+ * calculation is too heavy for everything to be done within a single access
+ * period (~15 us).
+ *
+ * Called with local interrupts disabled.
+ */
+static void omap_rtc_power_off(void)
+{
+        struct omap_rtc *rtc = omap_rtc_power_off_rtc;
+        struct rtc_time tm;
+        unsigned long now;
+        u32 val;
+
+        /* enable pmic_power_en control */
+        val = rtc_readl(rtc, OMAP_RTC_PMIC_REG);
+        rtc_writel(rtc, OMAP_RTC_PMIC_REG, val | OMAP_RTC_PMIC_POWER_EN_EN);
+
+        /* set alarm two seconds from now */
+        omap_rtc_read_time_raw(rtc, &tm);
+        bcd2tm(&tm);
+        rtc_tm_to_time(&tm, &now);
+        rtc_time_to_tm(now + 2, &tm);
+
+        if (tm2bcd(&tm) < 0) {
+                dev_err(&rtc->rtc->dev, "power off failed\n");
+                return;
+        }
+
+        rtc_wait_not_busy(rtc);
+
+        rtc_write(rtc, OMAP_RTC_ALARM2_SECONDS_REG, tm.tm_sec);
+        rtc_write(rtc, OMAP_RTC_ALARM2_MINUTES_REG, tm.tm_min);
+        rtc_write(rtc, OMAP_RTC_ALARM2_HOURS_REG, tm.tm_hour);
+        rtc_write(rtc, OMAP_RTC_ALARM2_DAYS_REG, tm.tm_mday);
+        rtc_write(rtc, OMAP_RTC_ALARM2_MONTHS_REG, tm.tm_mon);
+        rtc_write(rtc, OMAP_RTC_ALARM2_YEARS_REG, tm.tm_year);
+
+        /*
+         * enable ALARM2 interrupt
+         *
+         * NOTE: this fails on AM3352 if rtc_write (writeb) is used
+         */
+        val = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
+        rtc_writel(rtc, OMAP_RTC_INTERRUPTS_REG,
+                        val | OMAP_RTC_INTERRUPTS_IT_ALARM2);
+
+        /*
+         * Wait for alarm to trigger (within two seconds) and external PMIC to
+         * power off the system. Add a 500 ms margin for external latencies
+         * (e.g. debounce circuits).
+         */
+        mdelay(2500);
+}
+
 static struct rtc_class_ops omap_rtc_ops = {
         .read_time      = omap_rtc_read_time,
         .set_time       = omap_rtc_set_time,
@@ -338,137 +440,140 @@ static struct rtc_class_ops omap_rtc_ops = {
         .alarm_irq_enable = omap_rtc_alarm_irq_enable,
 };
 
-static int omap_rtc_alarm;
-static int omap_rtc_timer;
+static const struct omap_rtc_device_type omap_rtc_default_type = {
+        .has_power_up_reset = true,
+};
 
-#define OMAP_RTC_DATA_AM3352_IDX        1
-#define OMAP_RTC_DATA_DA830_IDX         2
+static const struct omap_rtc_device_type omap_rtc_am3352_type = {
+        .has_32kclk_en  = true,
+        .has_kicker     = true,
+        .has_irqwakeen  = true,
+        .has_pmic_mode  = true,
+};
 
-static struct platform_device_id omap_rtc_devtype[] = {
+static const struct omap_rtc_device_type omap_rtc_da830_type = {
+        .has_kicker     = true,
+};
+
+static const struct platform_device_id omap_rtc_id_table[] = {
         {
-                .name   = DRIVER_NAME,
-        },
-        [OMAP_RTC_DATA_AM3352_IDX] = {
+                .name   = "omap_rtc",
+                .driver_data = (kernel_ulong_t)&omap_rtc_default_type,
+        }, {
                 .name   = "am3352-rtc",
-                .driver_data = OMAP_RTC_HAS_KICKER | OMAP_RTC_HAS_IRQWAKEEN |
-                               OMAP_RTC_HAS_32KCLK_EN,
-        },
-        [OMAP_RTC_DATA_DA830_IDX] = {
+                .driver_data = (kernel_ulong_t)&omap_rtc_am3352_type,
+        }, {
                 .name   = "da830-rtc",
-                .driver_data = OMAP_RTC_HAS_KICKER,
-        },
-        {},
+                .driver_data = (kernel_ulong_t)&omap_rtc_da830_type,
+        }, {
+                /* sentinel */
+        }
 };
-MODULE_DEVICE_TABLE(platform, omap_rtc_devtype);
+MODULE_DEVICE_TABLE(platform, omap_rtc_id_table);
 
 static const struct of_device_id omap_rtc_of_match[] = {
-        {       .compatible     = "ti,da830-rtc",
-                .data           = &omap_rtc_devtype[OMAP_RTC_DATA_DA830_IDX],
-        },
-        {       .compatible     = "ti,am3352-rtc",
-                .data           = &omap_rtc_devtype[OMAP_RTC_DATA_AM3352_IDX],
-        },
-        {},
+        {
+                .compatible     = "ti,am3352-rtc",
+                .data           = &omap_rtc_am3352_type,
+        }, {
+                .compatible     = "ti,da830-rtc",
+                .data           = &omap_rtc_da830_type,
+        }, {
+                /* sentinel */
+        }
 };
 MODULE_DEVICE_TABLE(of, omap_rtc_of_match);
 
 static int __init omap_rtc_probe(struct platform_device *pdev)
 {
-        struct resource         *res;
-        struct rtc_device       *rtc;
-        u8                      reg, new_ctrl;
+        struct omap_rtc *rtc;
+        struct resource *res;
+        u8 reg, mask, new_ctrl;
         const struct platform_device_id *id_entry;
         const struct of_device_id *of_id;
+        int ret;
 
-        of_id = of_match_device(omap_rtc_of_match, &pdev->dev);
-        if (of_id)
-                pdev->id_entry = of_id->data;
+        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
+        if (!rtc)
+                return -ENOMEM;
 
-        id_entry = platform_get_device_id(pdev);
-        if (!id_entry) {
-                dev_err(&pdev->dev, "no matching device entry\n");
-                return -ENODEV;
+        of_id = of_match_device(omap_rtc_of_match, &pdev->dev);
+        if (of_id) {
+                rtc->type = of_id->data;
+                rtc->is_pmic_controller = rtc->type->has_pmic_mode &&
+                                of_property_read_bool(pdev->dev.of_node,
+                                                "system-power-controller");
+        } else {
+                id_entry = platform_get_device_id(pdev);
+                rtc->type = (void *)id_entry->driver_data;
         }
 
-        omap_rtc_timer = platform_get_irq(pdev, 0);
-        if (omap_rtc_timer <= 0) {
-                pr_debug("%s: no update irq?\n", pdev->name);
+        rtc->irq_timer = platform_get_irq(pdev, 0);
+        if (rtc->irq_timer <= 0)
                 return -ENOENT;
-        }
 
-        omap_rtc_alarm = platform_get_irq(pdev, 1);
-        if (omap_rtc_alarm <= 0) {
-                pr_debug("%s: no alarm irq?\n", pdev->name);
+        rtc->irq_alarm = platform_get_irq(pdev, 1);
+        if (rtc->irq_alarm <= 0)
                 return -ENOENT;
-        }
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        rtc_base = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(rtc_base))
-                return PTR_ERR(rtc_base);
+        rtc->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(rtc->base))
+                return PTR_ERR(rtc->base);
+
+        platform_set_drvdata(pdev, rtc);
 
         /* Enable the clock/module so that we can access the registers */
         pm_runtime_enable(&pdev->dev);
         pm_runtime_get_sync(&pdev->dev);
 
-        if (id_entry->driver_data & OMAP_RTC_HAS_KICKER) {
-                rtc_writel(KICK0_VALUE, OMAP_RTC_KICK0_REG);
-                rtc_writel(KICK1_VALUE, OMAP_RTC_KICK1_REG);
-        }
-
-        rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-                        &omap_rtc_ops, THIS_MODULE);
-        if (IS_ERR(rtc)) {
-                pr_debug("%s: can't register RTC device, err %ld\n",
-                        pdev->name, PTR_ERR(rtc));
-                goto fail0;
+        if (rtc->type->has_kicker) {
+                rtc_writel(rtc, OMAP_RTC_KICK0_REG, KICK0_VALUE);
+                rtc_writel(rtc, OMAP_RTC_KICK1_REG, KICK1_VALUE);
         }
-        platform_set_drvdata(pdev, rtc);
 
-        /* clear pending irqs, and set 1/second periodic,
-         * which we'll use instead of update irqs
+        /*
+         * disable interrupts
+         *
+         * NOTE: ALARM2 is not cleared on AM3352 if rtc_write (writeb) is used
          */
-        rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
+        rtc_writel(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
 
         /* enable RTC functional clock */
-        if (id_entry->driver_data & OMAP_RTC_HAS_32KCLK_EN)
-                rtc_writel(OMAP_RTC_OSC_32KCLK_EN, OMAP_RTC_OSC_REG);
+        if (rtc->type->has_32kclk_en) {
+                reg = rtc_read(rtc, OMAP_RTC_OSC_REG);
+                rtc_writel(rtc, OMAP_RTC_OSC_REG,
+                                reg | OMAP_RTC_OSC_32KCLK_EN);
+        }
 
         /* clear old status */
-        reg = rtc_read(OMAP_RTC_STATUS_REG);
-        if (reg & (u8) OMAP_RTC_STATUS_POWER_UP) {
-                pr_info("%s: RTC power up reset detected\n",
-                        pdev->name);
-                rtc_write(OMAP_RTC_STATUS_POWER_UP, OMAP_RTC_STATUS_REG);
-        }
-        if (reg & (u8) OMAP_RTC_STATUS_ALARM)
-                rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG);
+        reg = rtc_read(rtc, OMAP_RTC_STATUS_REG);
 
-        /* handle periodic and alarm irqs */
-        if (devm_request_irq(&pdev->dev, omap_rtc_timer, rtc_irq, 0,
-                        dev_name(&rtc->dev), rtc)) {
-                pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n",
-                        pdev->name, omap_rtc_timer);
-                goto fail0;
-        }
-        if ((omap_rtc_timer != omap_rtc_alarm) &&
-                (devm_request_irq(&pdev->dev, omap_rtc_alarm, rtc_irq, 0,
-                        dev_name(&rtc->dev), rtc))) {
-                pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n",
-                        pdev->name, omap_rtc_alarm);
-                goto fail0;
+        mask = OMAP_RTC_STATUS_ALARM;
+
+        if (rtc->type->has_pmic_mode)
+                mask |= OMAP_RTC_STATUS_ALARM2;
+
+        if (rtc->type->has_power_up_reset) {
+                mask |= OMAP_RTC_STATUS_POWER_UP;
+                if (reg & OMAP_RTC_STATUS_POWER_UP)
+                        dev_info(&pdev->dev, "RTC power up reset detected\n");
         }
 
+        if (reg & mask)
+                rtc_write(rtc, OMAP_RTC_STATUS_REG, reg & mask);
+
         /* On boards with split power, RTC_ON_NOFF won't reset the RTC */
-        reg = rtc_read(OMAP_RTC_CTRL_REG);
-        if (reg & (u8) OMAP_RTC_CTRL_STOP)
-                pr_info("%s: already running\n", pdev->name);
+        reg = rtc_read(rtc, OMAP_RTC_CTRL_REG);
+        if (reg & OMAP_RTC_CTRL_STOP)
+                dev_info(&pdev->dev, "already running\n");
 
         /* force to 24 hour mode */
-        new_ctrl = reg & (OMAP_RTC_CTRL_SPLIT|OMAP_RTC_CTRL_AUTO_COMP);
+        new_ctrl = reg & (OMAP_RTC_CTRL_SPLIT | OMAP_RTC_CTRL_AUTO_COMP);
         new_ctrl |= OMAP_RTC_CTRL_STOP;
 
-        /* BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE:
+        /*
+         * BOARD-SPECIFIC CUSTOMIZATION CAN GO HERE:
          *
          *  - Device wake-up capability setting should come through chip
          *    init logic. OMAP1 boards should initialize the "wakeup capable"
@@ -482,36 +587,70 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
          *    is write-only, and always reads as zero...)
          */
 
+        if (new_ctrl & OMAP_RTC_CTRL_SPLIT)
+                dev_info(&pdev->dev, "split power mode\n");
+
+        if (reg != new_ctrl)
+                rtc_write(rtc, OMAP_RTC_CTRL_REG, new_ctrl);
+
         device_init_wakeup(&pdev->dev, true);
 
-        if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT)
-                pr_info("%s: split power mode\n", pdev->name);
+        rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+                        &omap_rtc_ops, THIS_MODULE);
+        if (IS_ERR(rtc->rtc)) {
+                ret = PTR_ERR(rtc->rtc);
+                goto err;
+        }
 
-        if (reg != new_ctrl)
-                rtc_write(new_ctrl, OMAP_RTC_CTRL_REG);
+        /* handle periodic and alarm irqs */
+        ret = devm_request_irq(&pdev->dev, rtc->irq_timer, rtc_irq, 0,
+                        dev_name(&rtc->rtc->dev), rtc);
+        if (ret)
+                goto err;
+
+        if (rtc->irq_timer != rtc->irq_alarm) {
+                ret = devm_request_irq(&pdev->dev, rtc->irq_alarm, rtc_irq, 0,
+                                dev_name(&rtc->rtc->dev), rtc);
+                if (ret)
+                        goto err;
+        }
+
+        if (rtc->is_pmic_controller) {
+                if (!pm_power_off) {
+                        omap_rtc_power_off_rtc = rtc;
+                        pm_power_off = omap_rtc_power_off;
+                }
+        }
 
         return 0;
 
-fail0:
-        if (id_entry->driver_data & OMAP_RTC_HAS_KICKER)
-                rtc_writel(0, OMAP_RTC_KICK0_REG);
+err:
+        device_init_wakeup(&pdev->dev, false);
+        if (rtc->type->has_kicker)
+                rtc_writel(rtc, OMAP_RTC_KICK0_REG, 0);
         pm_runtime_put_sync(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
-        return -EIO;
+
+        return ret;
 }
 
 static int __exit omap_rtc_remove(struct platform_device *pdev)
 {
-        const struct platform_device_id *id_entry =
-                                platform_get_device_id(pdev);
+        struct omap_rtc *rtc = platform_get_drvdata(pdev);
+
+        if (pm_power_off == omap_rtc_power_off &&
+                        omap_rtc_power_off_rtc == rtc) {
+                pm_power_off = NULL;
+                omap_rtc_power_off_rtc = NULL;
+        }
 
         device_init_wakeup(&pdev->dev, 0);
 
         /* leave rtc running, but disable irqs */
-        rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
+        rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
 
-        if (id_entry->driver_data & OMAP_RTC_HAS_KICKER)
-                rtc_writel(0, OMAP_RTC_KICK0_REG);
+        if (rtc->type->has_kicker)
+                rtc_writel(rtc, OMAP_RTC_KICK0_REG, 0);
 
         /* Disable the clock/module */
         pm_runtime_put_sync(&pdev->dev);
@@ -521,20 +660,21 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
-static u8 irqstat;
-
 static int omap_rtc_suspend(struct device *dev)
 {
-        irqstat = rtc_read(OMAP_RTC_INTERRUPTS_REG);
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
 
-        /* FIXME the RTC alarm is not currently acting as a wakeup event
+        rtc->interrupts_reg = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
+
+        /*
+         * FIXME: the RTC alarm is not currently acting as a wakeup event
          * source on some platforms, and in fact this enable() call is just
          * saving a flag that's never used...
          */
         if (device_may_wakeup(dev))
-                enable_irq_wake(omap_rtc_alarm);
+                enable_irq_wake(rtc->irq_alarm);
         else
-                rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
+                rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
 
         /* Disable the clock/module */
         pm_runtime_put_sync(dev);
@@ -544,13 +684,15 @@ static int omap_rtc_suspend(struct device *dev)
 
 static int omap_rtc_resume(struct device *dev)
 {
+        struct omap_rtc *rtc = dev_get_drvdata(dev);
+
         /* Enable the clock/module so that we can access the registers */
         pm_runtime_get_sync(dev);
 
         if (device_may_wakeup(dev))
-                disable_irq_wake(omap_rtc_alarm);
+                disable_irq_wake(rtc->irq_alarm);
         else
-                rtc_write(irqstat, OMAP_RTC_INTERRUPTS_REG);
+                rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, rtc->interrupts_reg);
 
         return 0;
 }
@@ -560,23 +702,32 @@ static SIMPLE_DEV_PM_OPS(omap_rtc_pm_ops, omap_rtc_suspend, omap_rtc_resume);
 
 static void omap_rtc_shutdown(struct platform_device *pdev)
 {
-        rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
+        struct omap_rtc *rtc = platform_get_drvdata(pdev);
+        u8 mask;
+
+        /*
+         * Keep the ALARM interrupt enabled to allow the system to power up on
+         * alarm events.
+         */
+        mask = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
+        mask &= OMAP_RTC_INTERRUPTS_IT_ALARM;
+        rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, mask);
 }
 
-MODULE_ALIAS("platform:omap_rtc");
 static struct platform_driver omap_rtc_driver = {
         .remove         = __exit_p(omap_rtc_remove),
         .shutdown       = omap_rtc_shutdown,
         .driver         = {
-                .name   = DRIVER_NAME,
+                .name   = "omap_rtc",
                 .owner  = THIS_MODULE,
                 .pm     = &omap_rtc_pm_ops,
                 .of_match_table = omap_rtc_of_match,
         },
-        .id_table       = omap_rtc_devtype,
+        .id_table       = omap_rtc_id_table,
 };
 
 module_platform_driver_probe(omap_rtc_driver, omap_rtc_probe);
 
+MODULE_ALIAS("platform:omap_rtc");
 MODULE_AUTHOR("George G. Davis (and others)");
 MODULE_LICENSE("GPL");