Commit 204756f0 authored by Nobuhiro Iwamatsu's avatar Nobuhiro Iwamatsu Committed by Alexandre Belloni
Browse files

rtc: ds1307: Fix wday settings for rx8130 



rx8130 wday specifies the bit position, not BCD.

Fixes: ee0981be ("rtc: ds1307: Add support for Epson RX8130CE")
Signed-off-by: default avatarNobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20210420023917.1949066-1-nobuhiro1.iwamatsu@toshiba.co.jp
parent a1cfe7cc

drivers/rtc/rtc-ds1307.c

+10 −2
Original line number Diff line number Diff line
@@ -293,6 +293,10 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t) 
	t->tm_min = bcd2bin(regs[DS1307_REG_MIN] & 0x7f);

	tmp = regs[DS1307_REG_HOUR] & 0x3f;

	t->tm_hour = bcd2bin(tmp);

	/* rx8130 is bit position, not BCD */

	if (ds1307->type == rx_8130)

		t->tm_wday = fls(regs[DS1307_REG_WDAY] & 0x7f);

	else

		t->tm_wday = bcd2bin(regs[DS1307_REG_WDAY] & 0x07) - 1;

	t->tm_mday = bcd2bin(regs[DS1307_REG_MDAY] & 0x3f);

	tmp = regs[DS1307_REG_MONTH] & 0x1f;
@@ -340,6 +344,10 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) 
	regs[DS1307_REG_SECS] = bin2bcd(t->tm_sec);

	regs[DS1307_REG_MIN] = bin2bcd(t->tm_min);

	regs[DS1307_REG_HOUR] = bin2bcd(t->tm_hour);

	/* rx8130 is bit position, not BCD */

	if (ds1307->type == rx_8130)

		regs[DS1307_REG_WDAY] = 1 << t->tm_wday;

	else

		regs[DS1307_REG_WDAY] = bin2bcd(t->tm_wday + 1);

	regs[DS1307_REG_MDAY] = bin2bcd(t->tm_mday);

	regs[DS1307_REG_MONTH] = bin2bcd(t->tm_mon + 1);