Commit 8af760a3 authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: at91sam9: switch to rtc_time64_to_tm/rtc_tm_to_time64

Call the 64bit versions of rtc_tm time conversion as the range is enforced
by the core.
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent 255c43ca
...@@ -122,7 +122,7 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm) ...@@ -122,7 +122,7 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm)
if (secs != secs2) if (secs != secs2)
secs = rtt_readl(rtc, VR); secs = rtt_readl(rtc, VR);
rtc_time_to_tm(offset + secs, tm); rtc_time64_to_tm(offset + secs, tm);
dev_dbg(dev, "%s: %ptR\n", __func__, tm); dev_dbg(dev, "%s: %ptR\n", __func__, tm);
...@@ -135,15 +135,12 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm) ...@@ -135,15 +135,12 @@ static int at91_rtc_readtime(struct device *dev, struct rtc_time *tm)
static int at91_rtc_settime(struct device *dev, struct rtc_time *tm) static int at91_rtc_settime(struct device *dev, struct rtc_time *tm)
{ {
struct sam9_rtc *rtc = dev_get_drvdata(dev); struct sam9_rtc *rtc = dev_get_drvdata(dev);
int err;
u32 offset, alarm, mr; u32 offset, alarm, mr;
unsigned long secs; unsigned long secs;
dev_dbg(dev, "%s: %ptR\n", __func__, tm); dev_dbg(dev, "%s: %ptR\n", __func__, tm);
err = rtc_tm_to_time(tm, &secs); secs = rtc_tm_to_time64(tm);
if (err != 0)
return err;
mr = rtt_readl(rtc, MR); mr = rtt_readl(rtc, MR);
...@@ -193,7 +190,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) ...@@ -193,7 +190,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
memset(alrm, 0, sizeof(*alrm)); memset(alrm, 0, sizeof(*alrm));
if (alarm != ALARM_DISABLED && offset != 0) { if (alarm != ALARM_DISABLED && offset != 0) {
rtc_time_to_tm(offset + alarm, tm); rtc_time64_to_tm(offset + alarm, tm);
dev_dbg(dev, "%s: %ptR\n", __func__, tm); dev_dbg(dev, "%s: %ptR\n", __func__, tm);
...@@ -211,11 +208,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) ...@@ -211,11 +208,8 @@ static int at91_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
unsigned long secs; unsigned long secs;
u32 offset; u32 offset;
u32 mr; u32 mr;
int err;
err = rtc_tm_to_time(tm, &secs); secs = rtc_tm_to_time64(tm);
if (err != 0)
return err;
offset = gpbr_readl(rtc); offset = gpbr_readl(rtc);
if (offset == 0) { if (offset == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment