rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec

[rpmsg/hwspinlock.git] / drivers / rtc / rtc-omap.c

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index c214b69a8787cf3b5afc83bfbfbb791fdffb6a6c..320b4a520eb34de9af60969b032636d7ac6dcc7c 100644 (file)
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -421,12 +421,6 @@ static struct omap_rtc *omap_rtc_power_off_rtc;
  * 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)
@@ -434,6 +428,7 @@ static void omap_rtc_power_off(void)
        struct omap_rtc *rtc = omap_rtc_power_off_rtc;
        struct rtc_time tm;
        unsigned long now;
+       int seconds;
        u32 val;
 
        rtc->type->unlock(rtc);
@@ -441,14 +436,17 @@ static void omap_rtc_power_off(void)
        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 */
+again:
+       /* set alarm one second from now */
        omap_rtc_read_time_raw(rtc, &tm);
+       seconds = tm.tm_sec;
        bcd2tm(&tm);
        rtc_tm_to_time(&tm, &now);
-       rtc_time_to_tm(now + 2, &tm);
+       rtc_time_to_tm(now + 1, &tm);
 
        if (tm2bcd(&tm) < 0) {
                dev_err(&rtc->rtc->dev, "power off failed\n");
+               rtc->type->lock(rtc);
                return;
        }
 
@@ -469,14 +467,22 @@ static void omap_rtc_power_off(void)
        val = rtc_read(rtc, OMAP_RTC_INTERRUPTS_REG);
        rtc_writel(rtc, OMAP_RTC_INTERRUPTS_REG,
                        val | OMAP_RTC_INTERRUPTS_IT_ALARM2);
+
+       /* Retry in case roll over happened before alarm was armed. */
+       if (rtc_read(rtc, OMAP_RTC_SECONDS_REG) != seconds) {
+               val = rtc_read(rtc, OMAP_RTC_STATUS_REG);
+               if (!(val & OMAP_RTC_STATUS_ALARM2))
+                       goto again;
+       }
+
        rtc->type->lock(rtc);
 
        /*
-        * Wait for alarm to trigger (within two seconds) and external PMIC to
+        * Wait for alarm to trigger (within one second) and external PMIC to
         * power off the system. Add a 500 ms margin for external latencies
         * (e.g. debounce circuits).
         */
-       mdelay(2500);
+       mdelay(1500);
 }
 
 static const struct rtc_class_ops omap_rtc_ops = {
@@ -582,9 +588,7 @@ static int rtc_pinconf_get(struct pinctrl_dev *pctldev,
        u32 val;
        u16 arg = 0;
 
-       rtc->type->unlock(rtc);
        val = rtc_readl(rtc, OMAP_RTC_PMIC_REG);
-       rtc->type->lock(rtc);
 
        switch (param) {
        case PIN_CONFIG_INPUT_ENABLE:
@@ -614,9 +618,7 @@ static int rtc_pinconf_set(struct pinctrl_dev *pctldev,
        u32 param_val;
        int i;
 
-       rtc->type->unlock(rtc);
        val = rtc_readl(rtc, OMAP_RTC_PMIC_REG);
-       rtc->type->lock(rtc);
 
        /* active low by default */
        val |= OMAP_RTC_PMIC_EXT_WKUP_POL(pin);
@@ -724,8 +726,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
        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");
+                       of_device_is_system_power_controller(pdev->dev.of_node);
        } else {
                id_entry = platform_get_device_id(pdev);
                rtc->type = (void *)id_entry->driver_data;
@@ -873,7 +874,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
 
        ret = rtc_register_device(rtc->rtc);
        if (ret)
-               goto err;
+               goto err_deregister_pinctrl;
 
        rtc_nvmem_register(rtc->rtc, &omap_rtc_nvmem_config);
 
@@ -886,6 +887,8 @@ static int omap_rtc_probe(struct platform_device *pdev)
 
        return 0;
 
+err_deregister_pinctrl:
+       pinctrl_unregister(rtc->pctldev);
 err:
        clk_disable_unprepare(rtc->clk);
        device_init_wakeup(&pdev->dev, false);