From 95099d4622f8cb224d94e314c7a8e0df60b13f87 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Sat, 09 Dec 2023 08:38:01 +0000
Subject: [PATCH] enable docker ppp
---
kernel/drivers/power/supply/rk816_battery.c | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/kernel/drivers/power/supply/rk816_battery.c b/kernel/drivers/power/supply/rk816_battery.c
index 0a5abc3..d204a01 100644
--- a/kernel/drivers/power/supply/rk816_battery.c
+++ b/kernel/drivers/power/supply/rk816_battery.c
@@ -172,7 +172,7 @@
struct wake_lock wake_lock;
struct notifier_block fb_nb;
struct timer_list caltimer;
- time_t rtc_base;
+ time64_t rtc_base;
struct iio_channel *iio_chan;
struct notifier_block cable_cg_nb;
struct notifier_block cable_host_nb;
@@ -303,9 +303,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;
}
@@ -1873,15 +1873,13 @@
struct rk816_battery *di;
struct fb_event *evdata = data;
+ if (event != FB_EVENT_BLANK)
+ return NOTIFY_DONE;
+
di = container_of(nb, struct rk816_battery, fb_nb);
+ di->fb_blank = *(int *)evdata->data;
- if (event == FB_EVENT_BLANK || event == FB_EARLY_EVENT_BLANK ||
- event == FB_R_EARLY_EVENT_BLANK)
- di->fb_blank = *(int *)evdata->data;
- else
- di->fb_blank = 1;
-
- return 0;
+ return NOTIFY_OK;
}
static int rk816_bat_register_fb_notify(struct rk816_battery *di)
@@ -4352,13 +4350,11 @@
return 0;
}
-static time_t rk816_get_rtc_sec(void)
+static time64_t rk816_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) {
@@ -4372,10 +4368,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 rk816_bat_rtc_sleep_sec(struct rk816_battery *di)
--
Gitblit v1.6.2