| Message ID | 1414397368-26480-1-git-send-email-johan@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 27, 2014 at 09:09:28AM +0100, Johan Hovold wrote: > Add new property "ti,system-power-controller" to register the RTC as a > power-off handler. > > Some RTC IP revisions can control an external PMIC via the pmic_power_en > pin, which can be configured to transition to OFF on ALARM2 events and > back to ON on subsequent ALARM (wakealarm) events. > > This is based on earlier work by Colin Foe-Parker and AnilKumar Ch. [1] > > [1] https://www.mail-archive.com/linux-omap@vger.kernel.org/msg82127.html > > Tested-by: Felipe Balbi <balbi@ti.com> > Signed-off-by: Johan Hovold <johan@kernel.org> > --- > > Changes since v2: > - add two-second delay to allow alarm to trigger before returning > > Andrew, can you replace just this patch in the series that you already > have in your tree, or do you prefer I resend the whole series (with > Felipe's Tested-by tags)? > > Thanks, > Johan > > > Documentation/devicetree/bindings/rtc/rtc-omap.txt | 9 +- > drivers/rtc/rtc-omap.c | 95 ++++++++++++++++++++++ > 2 files changed, 103 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt > index 5a0f02d34d95..750efd40c72e 100644 > --- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt > +++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt > @@ -5,11 +5,17 @@ Required properties: > - "ti,da830-rtc" - for RTC IP used similar to that on DA8xx SoC family. > - "ti,am3352-rtc" - for RTC IP used similar to that on AM335x SoC family. > This RTC IP has special WAKE-EN Register to enable > - Wakeup generation for event Alarm. > + Wakeup generation for event Alarm. It can also be > + used to control an external PMIC via the > + pmic_power_en pin. > - reg: Address range of rtc register set > - interrupts: rtc timer, alarm interrupts in order > - interrupt-parent: phandle for the interrupt controller > > +Optional properties: > +- ti,system-power-controller: whether the rtc is controlling the system power isn't there a discussion going on to drop the vendor prefix ? I wonder if we should just use the final binding to avoid supporting this for rtc-omap too. OTOH, all of that can be hidden under of_is_system_power_controller() itself.
On Mon, Oct 27, 2014 at 11:45:44AM -0500, Felipe Balbi wrote: > On Mon, Oct 27, 2014 at 09:09:28AM +0100, Johan Hovold wrote: > > Add new property "ti,system-power-controller" to register the RTC as a > > power-off handler. > > > > Some RTC IP revisions can control an external PMIC via the pmic_power_en > > pin, which can be configured to transition to OFF on ALARM2 events and > > back to ON on subsequent ALARM (wakealarm) events. > > > > This is based on earlier work by Colin Foe-Parker and AnilKumar Ch. [1] > > > > [1] https://www.mail-archive.com/linux-omap@vger.kernel.org/msg82127.html > > > > Tested-by: Felipe Balbi <balbi@ti.com> > > Signed-off-by: Johan Hovold <johan@kernel.org> > > --- > > > > Changes since v2: > > - add two-second delay to allow alarm to trigger before returning > > > > Andrew, can you replace just this patch in the series that you already > > have in your tree, or do you prefer I resend the whole series (with > > Felipe's Tested-by tags)? > > > > Thanks, > > Johan > > > > > > Documentation/devicetree/bindings/rtc/rtc-omap.txt | 9 +- > > drivers/rtc/rtc-omap.c | 95 ++++++++++++++++++++++ > > 2 files changed, 103 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt > > index 5a0f02d34d95..750efd40c72e 100644 > > --- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt > > +++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt > > @@ -5,11 +5,17 @@ Required properties: > > - "ti,da830-rtc" - for RTC IP used similar to that on DA8xx SoC family. > > - "ti,am3352-rtc" - for RTC IP used similar to that on AM335x SoC family. > > This RTC IP has special WAKE-EN Register to enable > > - Wakeup generation for event Alarm. > > + Wakeup generation for event Alarm. It can also be > > + used to control an external PMIC via the > > + pmic_power_en pin. > > - reg: Address range of rtc register set > > - interrupts: rtc timer, alarm interrupts in order > > - interrupt-parent: phandle for the interrupt controller > > > > +Optional properties: > > +- ti,system-power-controller: whether the rtc is controlling the system power > > isn't there a discussion going on to drop the vendor prefix ? I wonder > if we should just use the final binding to avoid supporting this for > rtc-omap too. OTOH, all of that can be hidden under > of_is_system_power_controller() itself. Exactly, Romain intends to support both versions (i.e. with and without the prefix) with his helper function as there are already other uses of this variant in the wild. As I believe I mentioned in my cover letter, I suggest simply updating to the generic property name (i.e. use the helper and drop the prefix) once that code has been merged. Either way, we should always be able to change the property name before it has been used in a mainline release (as long as we update the driver and any dts use in one commit in order not to break bisectability). Johan
On Mon, Oct 27, 2014 at 05:56:54PM +0100, Johan Hovold wrote: > On Mon, Oct 27, 2014 at 11:45:44AM -0500, Felipe Balbi wrote: > > On Mon, Oct 27, 2014 at 09:09:28AM +0100, Johan Hovold wrote: > > > Add new property "ti,system-power-controller" to register the RTC as a > > > power-off handler. > > > > > > Some RTC IP revisions can control an external PMIC via the pmic_power_en > > > pin, which can be configured to transition to OFF on ALARM2 events and > > > back to ON on subsequent ALARM (wakealarm) events. > > > > > > This is based on earlier work by Colin Foe-Parker and AnilKumar Ch. [1] > > > > > > [1] https://www.mail-archive.com/linux-omap@vger.kernel.org/msg82127.html > > > > > > Tested-by: Felipe Balbi <balbi@ti.com> > > > Signed-off-by: Johan Hovold <johan@kernel.org> > > > --- > > > > > > Changes since v2: > > > - add two-second delay to allow alarm to trigger before returning > > > > > > Andrew, can you replace just this patch in the series that you already > > > have in your tree, or do you prefer I resend the whole series (with > > > Felipe's Tested-by tags)? > > > > > > Thanks, > > > Johan > > > > > > > > > Documentation/devicetree/bindings/rtc/rtc-omap.txt | 9 +- > > > drivers/rtc/rtc-omap.c | 95 ++++++++++++++++++++++ > > > 2 files changed, 103 insertions(+), 1 deletion(-) > > > > > > diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt > > > index 5a0f02d34d95..750efd40c72e 100644 > > > --- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt > > > +++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt > > > @@ -5,11 +5,17 @@ Required properties: > > > - "ti,da830-rtc" - for RTC IP used similar to that on DA8xx SoC family. > > > - "ti,am3352-rtc" - for RTC IP used similar to that on AM335x SoC family. > > > This RTC IP has special WAKE-EN Register to enable > > > - Wakeup generation for event Alarm. > > > + Wakeup generation for event Alarm. It can also be > > > + used to control an external PMIC via the > > > + pmic_power_en pin. > > > - reg: Address range of rtc register set > > > - interrupts: rtc timer, alarm interrupts in order > > > - interrupt-parent: phandle for the interrupt controller > > > > > > +Optional properties: > > > +- ti,system-power-controller: whether the rtc is controlling the system power > > > > isn't there a discussion going on to drop the vendor prefix ? I wonder > > if we should just use the final binding to avoid supporting this for > > rtc-omap too. OTOH, all of that can be hidden under > > of_is_system_power_controller() itself. > > Exactly, Romain intends to support both versions (i.e. with and without > the prefix) with his helper function as there are already other uses of > this variant in the wild. > > As I believe I mentioned in my cover letter, I suggest simply updating > to the generic property name (i.e. use the helper and drop the prefix) > once that code has been merged. Either way, we should always be able > to change the property name before it has been used in a mainline > release (as long as we update the driver and any dts use in one commit > in order not to break bisectability). fine by me :-) cheers
diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt index 5a0f02d34d95..750efd40c72e 100644 --- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt +++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt @@ -5,11 +5,17 @@ Required properties: - "ti,da830-rtc" - for RTC IP used similar to that on DA8xx SoC family. - "ti,am3352-rtc" - for RTC IP used similar to that on AM335x SoC family. This RTC IP has special WAKE-EN Register to enable - Wakeup generation for event Alarm. + Wakeup generation for event Alarm. It can also be + used to control an external PMIC via the + pmic_power_en pin. - reg: Address range of rtc register set - interrupts: rtc timer, alarm interrupts in order - interrupt-parent: phandle for the interrupt controller +Optional properties: +- ti,system-power-controller: whether the rtc is controlling the system power + through pmic_power_en + Example: rtc@1c23000 { @@ -18,4 +24,5 @@ rtc@1c23000 { interrupts = <19 19>; interrupt-parent = <&intc>; + ti,system-power-controller; }; diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index c508e45ca3ce..87cfee751554 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -68,6 +68,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) @@ -80,6 +89,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) @@ -89,6 +99,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) @@ -98,6 +109,9 @@ /* 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 @@ -106,6 +120,7 @@ struct omap_rtc_device_type { bool has_32kclk_en; bool has_kicker; bool has_irqwakeen; + bool has_pmic_mode; bool has_power_up_reset; }; @@ -115,6 +130,7 @@ struct omap_rtc { int irq_alarm; int irq_timer; u8 interrupts_reg; + bool is_pmic_controller; const struct omap_rtc_device_type *type; }; @@ -345,6 +361,65 @@ static int omap_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) 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 (~15us). + * + * 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); + + mdelay(2000); +} + static struct rtc_class_ops omap_rtc_ops = { .read_time = omap_rtc_read_time, .set_time = omap_rtc_set_time, @@ -361,6 +436,7 @@ 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 const struct omap_rtc_device_type omap_rtc_da830_type = { @@ -412,6 +488,9 @@ static int __init omap_rtc_probe(struct platform_device *pdev) 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, + "ti,system-power-controller"); } else { id_entry = platform_get_device_id(pdev); rtc->type = (void *)id_entry->driver_data; @@ -460,6 +539,9 @@ static int __init omap_rtc_probe(struct platform_device *pdev) 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) @@ -520,6 +602,13 @@ static int __init omap_rtc_probe(struct platform_device *pdev) 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; err: @@ -536,6 +625,12 @@ static int __exit omap_rtc_remove(struct platform_device *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 */