From 08f87f769b595151be1afeff53e144f543faa614 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 06 Dec 2023 09:51:13 +0000
Subject: [PATCH] add dts config
---
kernel/drivers/power/supply/rk817_battery.c | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/kernel/drivers/power/supply/rk817_battery.c b/kernel/drivers/power/supply/rk817_battery.c
index 498d8e9..6979531 100644
--- a/kernel/drivers/power/supply/rk817_battery.c
+++ b/kernel/drivers/power/supply/rk817_battery.c
@@ -560,7 +560,7 @@
int zero_batocv_to_cap;
int zero_xsoc;
unsigned long finish_base;
- time_t rtc_base;
+ time64_t rtc_base;
int sm_remain_cap;
int sm_linek;
int sm_chrg_dsoc;
@@ -631,9 +631,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;
}
@@ -710,14 +710,6 @@
unsigned int val)
{
return regmap_field_write(battery->rmap_fields[field_id], val);
-}
-
-static bool rk817_is_bat_exist(struct rk817_battery_device *battery)
-{
- if (battery->chip_id == RK817_ID)
- return rk817_bat_field_read(battery, BAT_EXS) ? true : false;
-
- return true;
}
/*cal_offset: current offset value*/
@@ -1186,7 +1178,7 @@
buf = (cap >> 0) & 0xff;
rk817_bat_field_write(battery, Q_INIT_L0, buf);
- battery->rsoc = capacity * 1000 * 100 / battery->fcc;
+ battery->rsoc = capacity * 1000 * 100 / DIV(battery->fcc);
battery->remain_cap = capacity * 1000;
DBG("new remaincap: %d\n", battery->remain_cap);
fuel_gauge_q_init_info(battery);
@@ -1874,8 +1866,6 @@
ret = of_property_read_u32(np, "virtual_power", &pdata->bat_mode);
if (ret < 0)
dev_err(dev, "virtual_power missing!\n");
- if (!rk817_is_bat_exist(battery))
- battery->pdata->bat_mode = MODE_VIRTUAL;
ret = of_property_read_u32(np, "bat_res", &pdata->bat_res);
if (ret < 0)
@@ -3089,13 +3079,11 @@
{
}
-static time_t rk817_get_rtc_sec(void)
+static time64_t rk817_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) {
@@ -3109,10 +3097,7 @@
return 0;
}
- rtc_tm_to_time(&tm, &tv.tv_sec);
- sec = tv.tv_sec;
-
- return sec;
+ return rtc_tm_to_time64(&tm);
}
#ifdef CONFIG_PM_SLEEP
--
Gitblit v1.6.2