Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d96a6f5 authored by Alexander Stein's avatar Alexander Stein Committed by Greg Kroah-Hartman
Browse files

rtc: pcf85063: Fix reading alarm 



[ Upstream commit a6ceee26fd5ed9b5bd37322b1ca88e4548cee4a3 ]

If the alarms are disabled the topmost bit (AEN_*) is set in the alarm
registers. This is also interpreted in BCD number leading to this warning:
rtc rtc0: invalid alarm value: 2022-09-21T80:80:80

Fix this by masking alarm enabling and reserved bits.

Fixes: 05cb3a56 ("rtc: pcf85063: add alarm support")
Signed-off-by: default avatarAlexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20220921074141.3903104-1-alexander.stein@ew.tq-group.com


Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bb1bdc72

drivers/rtc/rtc-pcf85063.c

+4 −4
Original line number Diff line number Diff line
@@ -159,10 +159,10 @@ static int pcf85063_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	if (ret)

		return ret;



	alrm->time.tm_sec = bcd2bin(buf[0]);

	alrm->time.tm_min = bcd2bin(buf[1]);

	alrm->time.tm_hour = bcd2bin(buf[2]);

	alrm->time.tm_mday = bcd2bin(buf[3]);

	alrm->time.tm_sec = bcd2bin(buf[0] & 0x7f);

	alrm->time.tm_min = bcd2bin(buf[1] & 0x7f);

	alrm->time.tm_hour = bcd2bin(buf[2] & 0x3f);

	alrm->time.tm_mday = bcd2bin(buf[3] & 0x3f);



	ret = regmap_read(pcf85063->regmap, PCF85063_REG_CTRL2, &val);

	if (ret)