* [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function
@ 2018-08-16 5:08 Keerthy
2018-08-16 5:09 ` [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec Keerthy
2018-08-27 20:53 ` [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function Alexandre Belloni
0 siblings, 2 replies; 5+ messages in thread
From: Keerthy @ 2018-08-16 5:08 UTC (permalink / raw)
To: a.zummo, alexandre.belloni
Cc: linux-rtc, linux-kernel, linux-omap, johan, j-keerthy
Use of_device_is_system_power_controller instead of manually reading
the system-power-controller property from the device tree node.
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Keerthy <j-keerthy@ti.com>
---
drivers/rtc/rtc-omap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 323ff55..44ff4cc 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -721,8 +721,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;
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec
2018-08-16 5:08 [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function Keerthy
@ 2018-08-16 5:09 ` Keerthy
2018-08-20 15:17 ` Johan Hovold
2018-08-27 20:53 ` Alexandre Belloni
2018-08-27 20:53 ` [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function Alexandre Belloni
1 sibling, 2 replies; 5+ messages in thread
From: Keerthy @ 2018-08-16 5:09 UTC (permalink / raw)
To: a.zummo, alexandre.belloni
Cc: linux-rtc, linux-kernel, linux-omap, johan, j-keerthy
Cut down the shutdown time from 2 seconds to 1 sec. In case of roll
over try again.
Signed-off-by: Keerthy <j-keerthy@ti.com>
---
drivers/rtc/rtc-omap.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 44ff4cc..320b4a5 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -421,12 +421,6 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
* 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,11 +436,13 @@ 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");
@@ -470,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 = {
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec
2018-08-16 5:09 ` [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec Keerthy
@ 2018-08-20 15:17 ` Johan Hovold
2018-08-27 20:53 ` Alexandre Belloni
1 sibling, 0 replies; 5+ messages in thread
From: Johan Hovold @ 2018-08-20 15:17 UTC (permalink / raw)
To: Keerthy
Cc: a.zummo, alexandre.belloni, linux-rtc, linux-kernel, linux-omap, johan
On Thu, Aug 16, 2018 at 10:39:00AM +0530, Keerthy wrote:
> Cut down the shutdown time from 2 seconds to 1 sec. In case of roll
> over try again.
>
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
You forgot to include a changelog, but it looks like you've addressed
the issues with v5, and this now looks good to me:
Reviewed-by: Johan Hovold <johan@kernel.org>
Johan
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function
2018-08-16 5:08 [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function Keerthy
2018-08-16 5:09 ` [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec Keerthy
@ 2018-08-27 20:53 ` Alexandre Belloni
1 sibling, 0 replies; 5+ messages in thread
From: Alexandre Belloni @ 2018-08-27 20:53 UTC (permalink / raw)
To: Keerthy; +Cc: a.zummo, linux-rtc, linux-kernel, linux-omap, johan
On 16/08/2018 10:38:59+0530, Keerthy wrote:
> Use of_device_is_system_power_controller instead of manually reading
> the system-power-controller property from the device tree node.
>
> Reviewed-by: Johan Hovold <johan@kernel.org>
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
> drivers/rtc/rtc-omap.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
Applied, thanks.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec
2018-08-16 5:09 ` [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec Keerthy
2018-08-20 15:17 ` Johan Hovold
@ 2018-08-27 20:53 ` Alexandre Belloni
1 sibling, 0 replies; 5+ messages in thread
From: Alexandre Belloni @ 2018-08-27 20:53 UTC (permalink / raw)
To: Keerthy; +Cc: a.zummo, linux-rtc, linux-kernel, linux-omap, johan
On 16/08/2018 10:39:00+0530, Keerthy wrote:
> Cut down the shutdown time from 2 seconds to 1 sec. In case of roll
> over try again.
>
> Signed-off-by: Keerthy <j-keerthy@ti.com>
> ---
> drivers/rtc/rtc-omap.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
Applied, thanks.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-08-27 20:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-16 5:08 [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function Keerthy
2018-08-16 5:09 ` [PATCH v6 2/2] rtc: omap: Cut down the shutdown time from 2 seconds to 1 sec Keerthy
2018-08-20 15:17 ` Johan Hovold
2018-08-27 20:53 ` Alexandre Belloni
2018-08-27 20:53 ` [PATCH v6 1/2] rtc: omap: use of_device_is_system_power_controller function Alexandre Belloni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).