Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] rtc-pcf8583: correct month and year offsets
No, today is not 4th April 3907, it's 4th March 2007.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Russell King and committed by Russell King 0ed8f210 f5e5b734
+6
-5
drivers/rtc/rtc-pcf8583.c
+6
-5
drivers/rtc/rtc-pcf8583.c
···
85
dt->tm_min = BCD2BIN(buf[2]);
86
dt->tm_hour = BCD2BIN(buf[3]);
87
dt->tm_mday = BCD2BIN(buf[4]);
88
-
dt->tm_mon = BCD2BIN(buf[5]);
89
}
90
91
return ret == 2 ? 0 : -EIO;
···
106
if (datetoo) {
107
len = 8;
108
buf[6] = BIN2BCD(dt->tm_mday) | (dt->tm_year << 6);
109
-
buf[7] = BIN2BCD(dt->tm_mon) | (dt->tm_wday << 5);
110
}
111
112
ret = i2c_master_send(client, (char *)buf, len);
···
226
*/
227
year_offset += 4;
228
229
-
tm->tm_year = real_year + year_offset + year[1] * 100;
230
231
return 0;
232
}
···
237
unsigned char year[2], chk;
238
struct rtc_mem cmos_year = { CMOS_YEAR, sizeof(year), year };
239
struct rtc_mem cmos_check = { CMOS_CHECKSUM, 1, &chk };
240
int ret;
241
242
/*
···
259
260
chk -= year[1] + year[0];
261
262
-
year[1] = tm->tm_year / 100;
263
-
year[0] = tm->tm_year % 100;
264
265
chk += year[1] + year[0];
266
···
85
dt->tm_min = BCD2BIN(buf[2]);
86
dt->tm_hour = BCD2BIN(buf[3]);
87
dt->tm_mday = BCD2BIN(buf[4]);
88
+
dt->tm_mon = BCD2BIN(buf[5]) - 1;
89
}
90
91
return ret == 2 ? 0 : -EIO;
···
106
if (datetoo) {
107
len = 8;
108
buf[6] = BIN2BCD(dt->tm_mday) | (dt->tm_year << 6);
109
+
buf[7] = BIN2BCD(dt->tm_mon + 1) | (dt->tm_wday << 5);
110
}
111
112
ret = i2c_master_send(client, (char *)buf, len);
···
226
*/
227
year_offset += 4;
228
229
+
tm->tm_year = (real_year + year_offset + year[1] * 100) - 1900;
230
231
return 0;
232
}
···
237
unsigned char year[2], chk;
238
struct rtc_mem cmos_year = { CMOS_YEAR, sizeof(year), year };
239
struct rtc_mem cmos_check = { CMOS_CHECKSUM, 1, &chk };
240
+
unsigned int proper_year = tm->tm_year + 1900;
241
int ret;
242
243
/*
···
258
259
chk -= year[1] + year[0];
260
261
+
year[1] = proper_year / 100;
262
+
year[0] = proper_year % 100;
263
264
chk += year[1] + year[0];
265