feat(bat): fix real cap & add bat 8000mA 2.0A charge config

huangcm

2025-09-01 53d8e046ac1bf2ebe94f671983e3d3be059df91a

feat(bat): fix real cap & add bat 8000mA 2.0A charge config

 longan/device/config/chips/a133/configs/c3/kickpi-k5c.dts
..
..
@@ -410,9 +410,9 @@
410
410
 					status = "okay";
411
411
 
412
412
 					pmu_usbpc_vol = <4600>;
413
-					pmu_usbpc_cur = <2500>;
413
+					pmu_usbpc_cur = <3000>;
414
414
 					pmu_usbad_vol = <4600>;
415
-					pmu_usbad_cur = <2500>;
415
+					pmu_usbad_cur = <3000>;
416
416
 
417
417
 					wakeup_usb_in;
418
418
 					wakeup_usb_out;
..
..
@@ -425,9 +425,9 @@
425
425
 					pmu_chg_ic_temp = <0>;
426
426
 					pmu_battery_rdc= <50>;
427
427
 					pmu_battery_cap = <8000>;
428
-					pmu_runtime_chgcur = <1000>;
429
-					pmu_suspend_chgcur = <2000>;
430
-					pmu_shutdown_chgcur = <2000>;
428
+					pmu_runtime_chgcur = <2800>;
429
+					pmu_suspend_chgcur = <2800>;
430
+					pmu_shutdown_chgcur = <2800>;
431
431
 					pmu_init_chgvol = <4280>;
432
432
 					pmu_battery_warning_level1 = <15>;
433
433
 					pmu_battery_warning_level2 = <0>;
..
..
@@ -1457,8 +1457,10 @@
1457
1457
 //#include "lcd-lvds-7-1024-600.dtsi"
1458
1458
 //#include "lcd-lvds-21-1920-1080.dtsi"
1459
1459
 //#include "lcd-mipi-10-800-1280-v1.dtsi"
1460
-#include "lcd-mipi-10-800-1280-v2.dtsi"
1460
+//#include "lcd-mipi-10-800-1280-v2.dtsi"
1461
1461
 //#include "lcd-mipi-8-800-1280.dtsi"
1462
-//#include "lcd-mipi-5-720-1280.dtsi"
1462
+#include "lcd-mipi-5-720-1280.dtsi"
1463
1463
 
1464
-#include "a133-kickpi-axp707-bat-5000mA.dtsi"
1464
+//#include "a133-kickpi-axp707-bat-5000mA.dtsi"
1465
+#include "a133-kickpi-axp707-bat-8000mA.dtsi"
1466
+
 longan/kernel/linux-4.9/arch/arm64/boot/dts/sunxi/a133-kickpi-axp707-bat-8000mA.dtsi
..
..
@@ -3,7 +3,7 @@
3
3
     status = "okay";
4
4
 
5
5
     pmu_chg_ic_temp = <0>;
6
-    pmu_battery_rdc= <10>;
6
+    pmu_battery_rdc= <60>;
7
7
     pmu_battery_cap = <8000>;
8
8
     pmu_runtime_chgcur = <2800>;
9
9
     pmu_suspend_chgcur = <2800>;
..
..
@@ -14,6 +14,7 @@
14
14
     pmu_chgled_func = <1>;
15
15
     pmu_chgled_type = <0>;
16
16
     ocv_coulumb_100 = <1>;
17
+    pmu_vol_min = <3400>;
17
18
 
18
19
     /* 3.1328 */
19
20
     pmu_bat_para1 = <0>;
 longan/kernel/linux-4.9/drivers/power/supply/axp803_battery.c
..
..
@@ -134,17 +134,23 @@
134
134
 	int rdc = 0;
135
135
 	int ret = 0;
136
136
 
137
+    int vbat = 0;
137
138
 	int charging = 0;
138
139
 	int ocv_pct = 0;
139
140
 	int coul_pct = 0;
140
141
 	int ac_valid = 0;
141
142
 	int usb_valid = 0;
143
+    int bat_cur_dir = 0;
144
+    static int low_power_cnt = 0;
142
145
 	static int pre_rest_vol, invalid_count;
143
146
 
144
147
 	struct axp_config_info *axp_config = &bat_power->dts_info;
145
148
 
146
149
     regmap_bulk_read(bat_power->regmap, AXP803_OCVBATH_RES, temp_val, 2);
147
150
 	ocv_vol = ((temp_val[0] << 4) | (temp_val[1] & 0xF)) * 1100 / 1000;
151
+
152
+    regmap_read(bat_power->regmap, AXP803_STATUS, &reg_value);
153
+    bat_cur_dir = (reg_value & 0x04) ? 1 : 0;
148
154
 
149
155
 	ret = regmap_read(bat_power->regmap, AXP803_CAP, &reg_value);
150
156
 	if (ret)
..
..
@@ -163,9 +169,18 @@
163
169
 			rest_vol = 100;
164
170
 		}
165
171
 
166
-        if (ocv_vol < axp_config->pmu_vol_min) {
167
-            // pr_err("kickpi: ocv_vol %d < min %d, rest_vol %d -> 0\n", ocv_vol, axp_config->pmu_vol_min, rest_vol);
168
-            rest_vol = 0;
172
+	    /* read ocv percentage */
173
+        regmap_read(bat_power->regmap, AXP803_OCV_PERCENT, &reg_value);
174
+        ocv_pct = (int)(reg_value & 0x7F);
175
+
176
+        /* read vol */
177
+        vbat = axp803_get_vbat(bat_power);
178
+        if (unlikely(axp_debug_mask & AXP_CHG)) { 
179
+            pr_err("kickpi: v1 ocv_pct = %d rest_vol = %d vbat = %d !\n", ocv_pct, rest_vol, vbat);
180
+        }
181
+
182
+        if ((ocv_pct == 0 && vbat > 0) || (rest_vol == 0 && vbat > 0) ) {
183
+            return 77;
169
184
         }
170
185
             
171
186
 		return rest_vol;
..
..
@@ -243,12 +258,26 @@
243
258
 			ocv_vol, rdc, coulumb_counter, batt_max_cap);
244
259
 	}
245
260
 
246
-    if (ocv_vol < axp_config->pmu_vol_min) {
247
-        // pr_err("kickpi: ocv_vol %d < min %d, rest_vol %d -> 0\n", ocv_vol, axp_config->pmu_vol_min, rest_vol);
248
-        rest_vol = 0;
261
+    /*
262
+        1. vol < low_power_protect when not charge
263
+        2. need power down
264
+    */
265
+    if (bat_cur_dir == 0 && ocv_vol < axp_config->pmu_vol_min) {
266
+        low_power_cnt++;
267
+        if (low_power_cnt >= 6) {
268
+            return 0;
269
+        }
270
+    } else {
271
+        low_power_cnt = 0;
249
272
     }
250
273
 
251
-	return rest_vol;
274
+    if (unlikely(axp_debug_mask & AXP_CHG)) {
275
+        vbat = axp803_get_vbat(bat_power);
276
+        pr_err("kickpi: v2 ocv_pct = %d rest_vol = %d vbat = %d !\n", ocv_pct, rest_vol, vbat);
277
+    }
278
+
279
+    return ocv_pct;
280
+	// return rest_vol;
252
281
 }
253
282
 
254
283
 static inline int axp_vts_to_mV(u16 reg)