Commit 3d5a4954 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: mpc5121: switch to rtc_time64_to_tm/rtc_tm_to_time64

parent 3905d1c0
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int mpc5121_rtc_read_time(struct device *dev, struct rtc_time *tm)
	 */
	now = in_be32(&regs->actual_time) + in_be32(&regs->target_time);

	rtc_time_to_tm(now, tm);
	rtc_time64_to_tm(now, tm);

	/*
	 * update second minute hour registers
@@ -126,15 +126,13 @@ static int mpc5121_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
	struct mpc5121_rtc_data *rtc = dev_get_drvdata(dev);
	struct mpc5121_rtc_regs __iomem *regs = rtc->regs;
	int ret;
	unsigned long now;

	/*
	 * The actual_time register is read only so we write the offset
	 * between it and linux time to the target_time register.
	 */
	ret = rtc_tm_to_time(tm, &now);
	if (ret == 0)
	now = rtc_tm_to_time64(tm);
	out_be32(&regs->target_time, now - in_be32(&regs->actual_time));

	/*