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

Commit a1e98e09 authored by Benoît Thébaudeau's avatar Benoît Thébaudeau Committed by Alexandre Belloni
Browse files

rtc: rv8803: Fix read day of week 



The Weekday register is encoded as 2^tm_wday, with tm_wday in 0..6, so
using tm_wday = ffs(reg) to fill tm_wday from the register value is
wrong because this gives the expected value + 1. This could be fixed as
tm_wday = ffs(reg) - 1, but tm_wday = ilog2(reg) works as well and is
more direct.

Signed-off-by: default avatarBenoît Thébaudeau <benoit@wsystem.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 96acb25c

drivers/rtc/rtc-rv8803.c

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/bcd.h>

#include <linux/bitops.h>

#include <linux/log2.h>

#include <linux/i2c.h>

#include <linux/interrupt.h>

#include <linux/kernel.h>
@@ -145,7 +146,7 @@ static int rv8803_get_time(struct device *dev, struct rtc_time *tm) 
	tm->tm_sec  = bcd2bin(date[RV8803_SEC] & 0x7f);

	tm->tm_min  = bcd2bin(date[RV8803_MIN] & 0x7f);

	tm->tm_hour = bcd2bin(date[RV8803_HOUR] & 0x3f);

	tm->tm_wday = ffs(date[RV8803_WEEK] & 0x7f);

	tm->tm_wday = ilog2(date[RV8803_WEEK] & 0x7f);

	tm->tm_mday = bcd2bin(date[RV8803_DAY] & 0x3f);

	tm->tm_mon  = bcd2bin(date[RV8803_MONTH] & 0x1f) - 1;

	tm->tm_year = bcd2bin(date[RV8803_YEAR]) + 100;