Skip to content

Commit

Permalink
rtc: puv3: switch to rtc_time64_to_tm/rtc_tm_to_time64
Browse files Browse the repository at this point in the history
Call the 64bit versions of rtc_tm time conversion.

Link: https://lore.kernel.org/r/20200306010240.40056-2-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
  • Loading branch information
Alexandre Belloni committed Mar 16, 2020
1 parent a04b3b9 commit 0155b54
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions drivers/rtc/rtc-puv3.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static int puv3_rtc_setpie(struct device *dev, int enabled)
/* Time read/write */
static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)
{
rtc_time_to_tm(readl(RTC_RCNR), rtc_tm);
rtc_time64_to_tm(readl(RTC_RCNR), rtc_tm);

dev_dbg(dev, "read time %ptRr\n", rtc_tm);

Expand All @@ -94,12 +94,9 @@ static int puv3_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm)

static int puv3_rtc_settime(struct device *dev, struct rtc_time *tm)
{
unsigned long rtc_count = 0;

dev_dbg(dev, "set time %ptRr\n", tm);

rtc_tm_to_time(tm, &rtc_count);
writel(rtc_count, RTC_RCNR);
writel(rtc_tm_to_time64(tm), RTC_RCNR);

return 0;
}
Expand All @@ -108,7 +105,7 @@ static int puv3_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
{
struct rtc_time *alm_tm = &alrm->time;

rtc_time_to_tm(readl(RTC_RTAR), alm_tm);
rtc_time64_to_tm(readl(RTC_RTAR), alm_tm);

alrm->enabled = readl(RTC_RTSR) & RTC_RTSR_ALE;

Expand All @@ -120,12 +117,10 @@ static int puv3_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
static int puv3_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
{
struct rtc_time *tm = &alrm->time;
unsigned long rtcalarm_count = 0;

dev_dbg(dev, "set alarm: %d, %ptRr\n", alrm->enabled, tm);

rtc_tm_to_time(tm, &rtcalarm_count);
writel(rtcalarm_count, RTC_RTAR);
writel(rtc_tm_to_time64(tm), RTC_RTAR);

puv3_rtc_setaie(dev, alrm->enabled);

Expand Down

0 comments on commit 0155b54

Please sign in to comment.