Merge tag 'for-v3.19' of git://git.infradead.org/battery-2.6

[cascardo/linux.git] / drivers / rtc / rtc-omap.c

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index e83f51a..8e5851a 100644 (file)
--- 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
@@ -154,19 +156,20 @@ 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(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(rtc, OMAP_RTC_STATUS_REG);
-               if ((status & (u8)OMAP_RTC_STATUS_BUSY) == 0)
+               if (!(status & OMAP_RTC_STATUS_BUSY))
                        break;
                udelay(1);
        }
@@ -175,9 +178,9 @@ static void rtc_wait_not_busy(struct omap_rtc *rtc)
 
 static irqreturn_t rtc_irq(int irq, void *dev_id)
 {
-       struct omap_rtc         *rtc = 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(rtc, OMAP_RTC_STATUS_REG);
 
@@ -276,6 +279,7 @@ static int omap_rtc_read_time(struct device *dev, struct rtc_time *tm)
        local_irq_enable();
 
        bcd2tm(tm);
+
        return 0;
 }
 
@@ -285,6 +289,7 @@ static int omap_rtc_set_time(struct device *dev, struct rtc_time *tm)
 
        if (tm2bcd(tm) < 0)
                return -EINVAL;
+
        local_irq_disable();
        rtc_wait_not_busy(rtc);
 
@@ -303,6 +308,7 @@ 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);
@@ -317,8 +323,9 @@ static int omap_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm)
        local_irq_enable();
 
        bcd2tm(&alm->time);
-       alm->enabled = !!(rtc_read(rtc, 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;
 }
@@ -479,9 +486,9 @@ MODULE_DEVICE_TABLE(of, omap_rtc_of_match);
 
 static int __init omap_rtc_probe(struct platform_device *pdev)
 {
-       struct omap_rtc         *rtc;
-       struct resource         *res;
-       u8                      reg, mask, 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;
@@ -495,7 +502,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
                rtc->type = of_id->data;
                rtc->is_pmic_controller = rtc->type->has_pmic_mode &&
                                of_property_read_bool(pdev->dev.of_node,
-                                               "ti,system-power-controller");
+                                               "system-power-controller");
        } else {
                id_entry = platform_get_device_id(pdev);
                rtc->type = (void *)id_entry->driver_data;
@@ -558,14 +565,15 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
 
        /* On boards with split power, RTC_ON_NOFF won't reset the RTC */
        reg = rtc_read(rtc, OMAP_RTC_CTRL_REG);
-       if (reg & (u8) OMAP_RTC_CTRL_STOP)
+       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"
@@ -579,7 +587,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
         *    is write-only, and always reads as zero...)
         */
 
-       if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT)
+       if (new_ctrl & OMAP_RTC_CTRL_SPLIT)
                dev_info(&pdev->dev, "split power mode\n");
 
        if (reg != new_ctrl)
@@ -658,7 +666,8 @@ static int omap_rtc_suspend(struct device *dev)
 
        rtc->interrupts_reg = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
 
-       /* FIXME the RTC alarm is not currently acting as a wakeup event
+       /*
+        * 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...
         */
@@ -694,8 +703,15 @@ static SIMPLE_DEV_PM_OPS(omap_rtc_pm_ops, omap_rtc_suspend, omap_rtc_resume);
 static void omap_rtc_shutdown(struct platform_device *pdev)
 {
        struct omap_rtc *rtc = platform_get_drvdata(pdev);
+       u8 mask;
 
-       rtc_write(rtc, OMAP_RTC_INTERRUPTS_REG, 0);
+       /*
+        * 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);
 }
 
 static struct platform_driver omap_rtc_driver = {
@@ -703,7 +719,6 @@ static struct platform_driver omap_rtc_driver = {
        .shutdown       = omap_rtc_shutdown,
        .driver         = {
                .name   = "omap_rtc",
-               .owner  = THIS_MODULE,
                .pm     = &omap_rtc_pm_ops,
                .of_match_table = omap_rtc_of_match,
        },