From b22da3d8526a935aa31e086e63f60ff3246cb61c Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Sat, 09 Dec 2023 07:24:11 +0000
Subject: [PATCH] add stmac read mac form eeprom
---
kernel/drivers/power/supply/rk818_battery.c | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/kernel/drivers/power/supply/rk818_battery.c b/kernel/drivers/power/supply/rk818_battery.c
index 8973f10..67cabe0 100644
--- a/kernel/drivers/power/supply/rk818_battery.c
+++ b/kernel/drivers/power/supply/rk818_battery.c
@@ -170,7 +170,7 @@
struct wake_lock wake_lock;
struct notifier_block fb_nb;
struct timer_list caltimer;
- time_t rtc_base;
+ time64_t rtc_base;
int bat_res;
int chrg_status;
bool is_initialized;
@@ -262,9 +262,9 @@
static u64 get_boot_sec(void)
{
- struct timespec ts;
+ struct timespec64 ts;
- get_monotonic_boottime(&ts);
+ ktime_get_boottime_ts64(&ts);
return ts.tv_sec;
}
@@ -1206,13 +1206,13 @@
struct rk818_battery *di;
struct fb_event *evdata = data;
- if (event != FB_EARLY_EVENT_BLANK && event != FB_EVENT_BLANK)
- return NOTIFY_OK;
+ if (event != FB_EVENT_BLANK)
+ return NOTIFY_DONE;
di = container_of(nb, struct rk818_battery, fb_nb);
di->fb_blank = *(int *)evdata->data;
- return 0;
+ return NOTIFY_OK;
}
static int rk818_bat_register_fb_notify(struct rk818_battery *di)
@@ -1740,7 +1740,7 @@
di->zero_linek = 1200;
else
di->zero_linek = 800;
- DBG("ZERO-new: zero_linek adjust step6...\n");
+ DBG("ZERO-new: zero_linek adjust step6...\n");
}
} else {
/* xsoc < 0 */
@@ -3127,13 +3127,11 @@
SAMPLE_RES_DIV1 : SAMPLE_RES_DIV2;
}
-static time_t rk818_get_rtc_sec(void)
+static time64_t rk818_get_rtc_sec(void)
{
int err;
struct rtc_time tm;
- struct timespec tv = { .tv_nsec = NSEC_PER_SEC >> 1, };
struct rtc_device *rtc = rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
- time_t sec;
err = rtc_read_time(rtc, &tm);
if (err) {
@@ -3147,10 +3145,7 @@
return 0;
}
- rtc_tm_to_time(&tm, &tv.tv_sec);
- sec = tv.tv_sec;
-
- return sec;
+ return rtc_tm_to_time64(&tm);
}
static int rk818_bat_rtc_sleep_sec(struct rk818_battery *di)
--
Gitblit v1.6.2