Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix h616-RTC patches that are breaking builds for armhf #3118

Merged
merged 2 commits into from
Sep 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ index adec1b14a8de..e4fc6e4f2bfb 100644
+ rtc_tm->tm_sec = 0;
+ rtc_tm->tm_min = 0;
+ rtc_tm->tm_hour = 0;
+ date = rtc_tm_to_time64(rtc_tm) / SEC_PER_DAY;
+ date = div_u64(rtc_tm_to_time64(rtc_tm), SEC_PER_DAY);
+ } else {
+ rtc_tm->tm_year -= SUN6I_YEAR_OFF;
+ rtc_tm->tm_mon += 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ index e4fc6e4f2bfb..54bd47fb0a5f 100644
+ counter_val_hms = SUN6I_TIME_SET_SEC_VALUE(alrm_tm->tm_sec) |
+ SUN6I_TIME_SET_MIN_VALUE(alrm_tm->tm_min) |
+ SUN6I_TIME_SET_HOUR_VALUE(alrm_tm->tm_hour);
+ counter_val = mktime64(alrm_tm->tm_year + 1900, alrm_tm->tm_mon,
+ alrm_tm->tm_mday, 0, 0, 0) / SEC_PER_DAY;
+ counter_val = div_u64(mktime64(alrm_tm->tm_year + 1900, alrm_tm->tm_mon,
+ alrm_tm->tm_mday, 0, 0, 0), SEC_PER_DAY);
+ } else {
+ /* The alarm register holds the number of seconds left. */
+ unsigned long time_now;
Expand Down