Commit 0155b547 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: puv3: switch to rtc_time64_to_tm/rtc_tm_to_time64 

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: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent a04b3b96

drivers/rtc/rtc-puv3.c

+4 −9
Original line number Diff line number Diff line
@@ -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);
@@ -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;

}
@@ -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;
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE