Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0072b78be2b41e5a0ca3ddc39335574dc2e855bd

Authored by Stefan Roese
Committed by Wolfgang Denk
1 parent 50f93d30da
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

RTC: Fix month offset by one problem in M41T62 RTC driver 

This patch fixes a problem with the month being read and written
incorrectly (offset by one). This only gets visible by also using
the Linux driver (rtc-m41t80).

Tested on AMCC Canyonlands.

Signed-off-by: Stefan Roese <sr@denx.de>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/rtc/m41t62.c
Diff comments   View file @ 0072b78
... ... @@ -81,7 +81,7 @@
81 81 tm->tm_hour = BCD2BIN(buf[M41T62_REG_HOUR] & 0x3f);
82 82 tm->tm_mday = BCD2BIN(buf[M41T62_REG_DAY] & 0x3f);
83 83 tm->tm_wday = buf[M41T62_REG_WDAY] & 0x07;
84   - tm->tm_mon = BCD2BIN(buf[M41T62_REG_MON] & 0x1f) - 1;
  84 + tm->tm_mon = BCD2BIN(buf[M41T62_REG_MON] & 0x1f);
85 85  
86 86 /* assume 20YY not 19YY, and ignore the Century Bit */
87 87 /* U-Boot needs to add 1900 here */
... ... @@ -119,7 +119,7 @@
119 119 buf[M41T62_REG_DAY] =
120 120 BIN2BCD(tm->tm_mday) | (buf[M41T62_REG_DAY] & ~0x3f);
121 121 buf[M41T62_REG_MON] =
122   - BIN2BCD(tm->tm_mon + 1) | (buf[M41T62_REG_MON] & ~0x1f);
  122 + BIN2BCD(tm->tm_mon) | (buf[M41T62_REG_MON] & ~0x1f);
123 123 /* assume 20YY not 19YY */
124 124 buf[M41T62_REG_YEAR] = BIN2BCD(tm->tm_year % 100);
125 125