Commit fb1283bf authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: ab-eoz9: fix abeoz9_rtc_read_alarm 

abeoz9_rtc_read_alarm assumes we always read the alarm in 12-hour mode
while abeoz9_rtc_set_alarm will always set it in 24-hour mode.

We could support 12-hour mode in both functions but it seems very unlikely
that the RTC would be set to 12-hour mode now as the driver has been
setting it to 24-hour mode for a while now. The setting is undefined at
power-up and unchanged by subsequent resets which doesn't help us.

Link: https://lore.kernel.org/r/20241112151119.3451611-1-alexandre.belloni@bootlin.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent bb3d498f

drivers/rtc/rtc-ab-eoz9.c

+1 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#define ABEOZ9_BIT_ALARM_MIN		GENMASK(6, 0)

#define ABEOZ9_REG_ALARM_HOURS		0x12

#define ABEOZ9_BIT_ALARM_HOURS_PM	BIT(5)

#define ABEOZ9_BIT_ALARM_HOURS		GENMASK(4, 0)

#define ABEOZ9_BIT_ALARM_HOURS		GENMASK(5, 0)

#define ABEOZ9_REG_ALARM_DAYS		0x13

#define ABEOZ9_BIT_ALARM_DAYS		GENMASK(5, 0)

#define ABEOZ9_REG_ALARM_WEEKDAYS	0x14
@@ -231,8 +231,6 @@ static int abeoz9_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) 
	alarm->time.tm_sec = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_SEC, regs[0]));

	alarm->time.tm_min = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_MIN, regs[1]));

	alarm->time.tm_hour = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_HOURS, regs[2]));

	if (FIELD_GET(ABEOZ9_BIT_ALARM_HOURS_PM, regs[2]))

		alarm->time.tm_hour += 12;



	alarm->time.tm_mday = bcd2bin(FIELD_GET(ABEOZ9_BIT_ALARM_DAYS, regs[3]));