| Message ID | 1584525218-14719-1-git-send-email-maggarwa@codeaurora.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | rtc-pm8xxx: Clear Alarm register on resume | expand |
Hi, On 18/03/2020 15:23:38+0530, Mohit Aggarwal wrote: > Currently, alarm register is not cleared on resume > leading to reboot during power off charging mode. > > Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org> > --- > drivers/rtc/rtc-pm8xxx.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c > index bbe013f..bfcd878 100644 > --- a/drivers/rtc/rtc-pm8xxx.c > +++ b/drivers/rtc/rtc-pm8xxx.c > @@ -1,5 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0-only > -/* Copyright (c) 2010-2011, 2019, The Linux Foundation. All rights reserved. */ > +/* Copyright (c) 2010-2011, 2019-2020, The Linux Foundation. All rights reserved. */ > This part doesn't apply and is not based on upstream. > #include <linux/of.h> > #include <linux/module.h> > @@ -301,6 +301,7 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) > struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev); > const struct pm8xxx_rtc_regs *regs = rtc_dd->regs; > unsigned int ctrl_reg; > + u8 value[NUM_8_BIT_RTC_REGS] = {0}; > > spin_lock_irqsave(&rtc_dd->ctrl_reg_lock, irq_flags); > > @@ -319,6 +320,16 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) > goto rtc_rw_fail; > } > > + /* Clear Alarm register */ > + if (!enable) { > + rc = regmap_bulk_write(rtc_dd->regmap, regs->alarm_rw, value, > + sizeof(value)); > + if (rc) { > + dev_err(dev, "Write to RTC ALARM register failed\n"); > + goto rtc_rw_fail; > + } > + } > + > rtc_rw_fail: > spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags); > return rc; > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project
diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c index bbe013f..bfcd878 100644 --- a/drivers/rtc/rtc-pm8xxx.c +++ b/drivers/rtc/rtc-pm8xxx.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2010-2011, 2019, The Linux Foundation. All rights reserved. */ +/* Copyright (c) 2010-2011, 2019-2020, The Linux Foundation. All rights reserved. */ #include <linux/of.h> #include <linux/module.h> @@ -301,6 +301,7 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev); const struct pm8xxx_rtc_regs *regs = rtc_dd->regs; unsigned int ctrl_reg; + u8 value[NUM_8_BIT_RTC_REGS] = {0}; spin_lock_irqsave(&rtc_dd->ctrl_reg_lock, irq_flags); @@ -319,6 +320,16 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) goto rtc_rw_fail; } + /* Clear Alarm register */ + if (!enable) { + rc = regmap_bulk_write(rtc_dd->regmap, regs->alarm_rw, value, + sizeof(value)); + if (rc) { + dev_err(dev, "Write to RTC ALARM register failed\n"); + goto rtc_rw_fail; + } + } + rtc_rw_fail: spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags); return rc;
Currently, alarm register is not cleared on resume leading to reboot during power off charging mode. Signed-off-by: Mohit Aggarwal <maggarwa@codeaurora.org> --- drivers/rtc/rtc-pm8xxx.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)