Skip to content

Commit 8148c21

Browse files
author
pswbuild
committed
Synchronize code for OnePlus CPH2649_16.0.5.701(EX01) CPH2653_16.0.5.701(EX01) PJZ110_16.0.5.701(CN01)
Based on QCOM release TAG: kernel/build:AU_LINUX_KERNEL.PLATFORM.4.0.R1.00.00.00.061.111 platform/vendor/nxp/opensource/driver:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/opensource/camera-devicetree:AU_TECHPACK_CAMERA.LA.5.0.R1.00.00.00.000.066 platform/vendor/opensource/camera-kernel:AU_TECHPACK_CAMERA.LA.5.0.R1.00.00.00.000.066 platform/vendor/opensource/dataipa:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/opensource/display-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/display-drivers:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/eva-devicetree:AU_TECHPACK_CV.LA.2.1.R1.00.00.00.000.032 platform/vendor/opensource/eva-kernel:AU_TECHPACK_CV.LA.2.1.R1.00.00.00.000.032 platform/vendor/opensource/mm-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/mm-drivers:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/mmrm-devicetree:AU_TECHPACK_VIDEO.LA.5.0.R1.00.00.00.000.049 platform/vendor/opensource/mmrm-driver:AU_TECHPACK_VIDEO.LA.5.0.R1.00.00.00.000.049 platform/vendor/opensource/synx-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/opensource/video-devicetree:AU_TECHPACK_VIDEO.LA.5.0.R1.00.00.00.000.049 platform/vendor/proprietary/mm-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/qcom-opensource/bt-devicetree:AU_TECHPACK_BTFM.LA.1.0.R1.00.00.00.000.057 platform/vendor/qcom-opensource/bt-kernel:AU_TECHPACK_BTFM.LA.1.0.R1.00.00.00.000.057 platform/vendor/qcom-opensource/data-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/data-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/devicetree:AU_LINUX_KERNEL.PLATFORM.4.0.R1.00.00.00.061.111 platform/vendor/qcom-opensource/eSE-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/nfc-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/synx-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/wlan/fw-api:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/platform:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/qcacld-3.0:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/utils/sigma-dut:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/wlan-devicetree:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-proprietary/display-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/qcom/opensource/audio-devicetree:AU_TECHPACK_AUDIO_HANDSET.LA.10.0.R1.00.00.00.000.061 platform/vendor/qcom/opensource/audio-kernel-ar:AU_TECHPACK_AUDIO_HANDSET.LA.10.0.R1.00.00.00.000.061 platform/vendor/qcom/opensource/datarmnet:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/datarmnet-ext:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/dsp-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/dsp-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/graphics-devicetree:AU_TECHPACK_GRAPHICS.LA.15.0.R1.00.00.00.000.053 platform/vendor/qcom/opensource/graphics-kernel:AU_TECHPACK_GRAPHICS.LA.15.0.R1.00.00.00.000.053 platform/vendor/qcom/opensource/securemsm-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/spu-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/st/opensource/driver:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/st/opensource/eSE-driver:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150
1 parent 8769f89 commit 8148c21

198 files changed

Lines changed: 19885 additions & 29766 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/oplus-chg-23821-silicon-p-770.dtsi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
oplus_spec,ffc-temp-thr = <120 210 350 440>;
2727
oplus_spec,wired-ffc-step-max = <2>;
2828
oplus_spec,wired-ffc-fv-mv = <4590 4590>;
29+
oplus_spec,bdd-vbatdiff-mv = <50>;
30+
oplus_spec,bdd-enter-current-ma = <100>;
31+
oplus_spec,bdd-enter-voltage-mv = <200>;
32+
oplus_spec,bdd-vbatdiff-timeout-min = <10080>;
2933

3034
oplus_spec,wired-ffc-fv-cutoff-mv = <4550 4525 4490
3135
4520 4505 4475>;

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/oplus-chg-23821.dtsi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -695,6 +695,10 @@
695695
oplus_spec,ffc-temp-thr = <120 210 350 440>;
696696
oplus_spec,wired-ffc-step-max = <2>;
697697
oplus_spec,wired-ffc-fv-mv = <4590 4590>;
698+
oplus_spec,bdd-vbatdiff-mv = <50>;
699+
oplus_spec,bdd-enter-current-ma = <100>;
700+
oplus_spec,bdd-enter-voltage-mv = <200>;
701+
oplus_spec,bdd-vbatdiff-timeout-min = <10080>;
698702

699703
oplus_spec,wired-ffc-fv-cutoff-mv = <4545 4515 4500
700704
4515 4505 4490>;

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/oplus-chg-24851-pps.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@
6565
oplus,plc_strategy-data = <&cp_2t1_simple_strategy>;
6666
oplus,plc_strategy-names = "default";
6767

68+
oplus,temperature_strategy_name = "cgcl";
69+
oplus,temperature_strategy_data = <OPLUS_STRATEGY_USE_SHELL_TEMP
70+
0 430 11000 1 0
71+
428 435 3000 2 0
72+
430 435 2000 2 1>;
73+
6874
pps_third_lcf_strategy {
6975
oplus,temp_type = <OPLUS_STRATEGY_USE_SHELL_TEMP>;
7076
oplus,temp_range = <0 50 120 160 210 380 440>;

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/oplus-chg-24851.dtsi‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
deep_spec,support;
101101
deep_spec,uv_thr = <2750>;
102102
deep_spec,count_thr = <50>;
103-
deep_spec,vbat_soc = <20>;
103+
deep_spec,vbat_soc = <80>;
104104
deep_spec,count_step = <0 10 0
105105
350 12 1
106106
450 15 2
@@ -122,14 +122,14 @@
122122
deep_spec,ddbc_curve {
123123
oplus,temp_type = <OPLUS_STRATEGY_USE_BATT_TEMP>;
124124
oplus,temp_range = <(-100) 0 200>;
125-
deep_spec,ddbc_temp_cold = <500 3310 5
126-
10000 3260 2>;
127-
deep_spec,ddbc_temp_cool = <500 3310 5
128-
10000 3260 2>;
129-
deep_spec,ddbc_temp_normal = <500 3310 5
130-
10000 3260 2>;
131-
deep_spec,ddbc_temp_warm = <500 3310 5
132-
10000 3260 2>;
125+
deep_spec,ddbc_temp_cold = <500 3250 5
126+
10000 3200 2>;
127+
deep_spec,ddbc_temp_cool = <500 3250 5
128+
10000 3200 2>;
129+
deep_spec,ddbc_temp_normal = <500 3250 5
130+
10000 3200 2>;
131+
deep_spec,ddbc_temp_warm = <500 3250 5
132+
10000 3200 2>;
133133
};
134134
ddrc_strategy {
135135
oplus,temp_type = <OPLUS_STRATEGY_USE_BATT_TEMP>;
@@ -615,7 +615,7 @@
615615
18000 /* OPLUS_WIRED_CHG_MODE_QC */
616616
18000 /* OPLUS_WIRED_CHG_MODE_PD */
617617
>;
618-
oplus_spec,led_on-fccmax-ma = <0 722 2200 3618 4400 4400 4400 1000 0>;
618+
oplus_spec,led_on-fccmax-ma = <0 722 2170 3618 4400 4400 4400 1000 0>;
619619
oplus_spec,fccmax-ma-lv = <
620620
0 521 2200 2200 2200 2200 2200 2200 0 /* OPLUS_WIRED_CHG_MODE_UNKNOWN */
621621
0 600 600 600 600 600 600 600 0 /* OPLUS_WIRED_CHG_MODE_SDP */
@@ -670,7 +670,7 @@
670670
oplus_spec,non-standard-hw-fv-inc-mv = <18>;
671671
oplus_spec,non-standard-sw-over-fv-mv = <3990>;
672672
oplus_spec,non-standard-vbatdet-mv = <3680>;
673-
oplus_spec,wired-vbatdet-mv = <0 4220 4319 4420 4420 4420 4400 4030 0>;
673+
oplus_spec,wired-vbatdet-mv = <0 4220 4320 4420 4420 4420 4400 4030 0>;
674674
oplus_spec,fcc-gear-thr-mv = <3980>;
675675
oplus_spec,fcc-gear-shake-mv = <400 400 400 300 300 180 180 180 180>;
676676
oplus_spec,vbatt-ov-thr-mv = <4600>;

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/oplus-chg-8750.h.dtsi‎

100644100755
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,9 @@
310310
#define OPLUS_IC_FUNC_GAUGE_SET_TRUE_FCC (OPLUS_IC_FUNC_NUM_GAUGE2_START + 8)
311311
#define OPLUS_IC_FUNC_GAUGE_GET_SN_MATCH (OPLUS_IC_FUNC_NUM_GAUGE2_START + 9)
312312
#define OPLUS_IC_FUNC_GAUGE_SYNC_PLUGIN (OPLUS_IC_FUNC_NUM_GAUGE2_START + 10)
313-
#define OPLUS_IC_FUNC_GAUGE_FCC_VDELTA_CHECK (OPLUS_IC_FUNC_NUM_GAUGE2_START + 11)
314-
#define OPLUS_IC_FUNC_GAUGE_FFC_T_RA_CHECK (OPLUS_IC_FUNC_NUM_GAUGE2_START + 12)
315-
#define OPLUS_IC_FUNC_GAUGE_FFC_RA0_CHECK (OPLUS_IC_FUNC_NUM_GAUGE2_START + 13)
313+
#define OPLUS_IC_FUNC_GAUGE_FCC_VDELTA_CHECK (OPLUS_IC_FUNC_NUM_GAUGE2_START + 13)
314+
#define OPLUS_IC_FUNC_GAUGE_FFC_T_RA_CHECK (OPLUS_IC_FUNC_NUM_GAUGE2_START + 14)
315+
#define OPLUS_IC_FUNC_GAUGE_FFC_RA0_CHECK (OPLUS_IC_FUNC_NUM_GAUGE2_START + 15)
316316

317317
/* misc */
318318
#define OPLUS_IC_FUNC_NUM_MISC_START 500

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/vw/oplus-chg-vw-cn-in-curve.dtsi‎

Lines changed: 56 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@
170170
4540 20 0 0 0
171171
4540 15 0 0 0
172172
4550 12 1 0 0>;
173-
strategy_temp_warm = <4120 20 0 0 0
173+
strategy_temp_warm = <4120 24 0 0 0
174+
4120 20 0 0 0
174175
4120 15 0 0 0
175176
4130 10 1 0 0>;
176177
};
@@ -225,7 +226,8 @@
225226
4540 20 0 0 0
226227
4540 15 0 0 0
227228
4550 12 1 0 0>;
228-
strategy_temp_warm = <4120 20 0 0 0
229+
strategy_temp_warm = <4120 24 0 0 0
230+
4120 20 0 0 0
229231
4120 15 0 0 0
230232
4130 10 1 0 0>;
231233
};
@@ -280,7 +282,8 @@
280282
4540 20 0 0 0
281283
4540 15 0 0 0
282284
4550 12 1 0 0>;
283-
strategy_temp_warm = <4120 20 0 0 0
285+
strategy_temp_warm = <4120 24 0 0 0
286+
4120 20 0 0 0
284287
4120 15 0 0 0
285288
4130 10 1 0 0>;
286289
};
@@ -319,9 +322,11 @@
319322
strategy_temp_little_cool_high =<4510 15 0 0 0
320323
4540 12 0 0 0
321324
4550 10 1 0 0>;
322-
strategy_temp_normal_low = <4540 15 0 0 0
325+
strategy_temp_normal_low = <4540 20 0 0 0
326+
4540 15 0 0 0
323327
4550 10 1 0 0>;
324-
strategy_temp_normal_high = <4540 20 0 0 0
328+
strategy_temp_normal_high = <4540 25 0 0 0
329+
4540 20 0 0 0
325330
4540 15 0 0 0
326331
4550 12 1 0 0>;
327332
strategy_temp_warm = <4130 10 1 0 0>;
@@ -333,7 +338,8 @@
333338
strategy_temp_little_cool = <4230 10 1 0 0>;
334339
strategy_temp_little_cool_high =<4550 10 1 0 0>;
335340
strategy_temp_normal_low = <4550 10 1 0 0>;
336-
strategy_temp_normal_high = <4550 12 1 0 0>;
341+
strategy_temp_normal_high = <4540 15 0 0 0
342+
4550 12 1 0 0>;
337343
strategy_temp_warm = <4130 10 1 0 0>;
338344
};
339345
};
@@ -367,7 +373,8 @@
367373
4540 40 0 0 0
368374
4540 30 0 0 0
369375
4550 24 1 0 0>;
370-
strategy_temp_warm = <4120 40 0 0 0
376+
strategy_temp_warm = <4120 48 0 0 0
377+
4120 40 0 0 0
371378
4120 30 0 0 0
372379
4130 20 1 0 0>;
373380
};
@@ -400,7 +407,8 @@
400407
4540 40 0 0 0
401408
4540 30 0 0 0
402409
4550 24 1 0 0>;
403-
strategy_temp_warm = <4120 40 0 0 0
410+
strategy_temp_warm = <4120 48 0 0 0
411+
4120 40 0 0 0
404412
4120 30 0 0 0
405413
4130 20 1 0 0>;
406414
};
@@ -433,7 +441,8 @@
433441
4540 40 0 0 0
434442
4540 30 0 0 0
435443
4550 24 1 0 0>;
436-
strategy_temp_warm = <4120 40 0 0 0
444+
strategy_temp_warm = <4120 48 0 0 0
445+
4120 40 0 0 0
437446
4120 30 0 0 0
438447
4130 20 1 0 0>;
439448
};
@@ -472,9 +481,11 @@
472481
strategy_temp_little_cool_high =<4510 30 0 0 0
473482
4540 24 0 0 0
474483
4550 20 1 0 0>;
475-
strategy_temp_normal_low = <4540 30 0 0 0
484+
strategy_temp_normal_low = <4540 40 0 0 0
485+
4540 30 0 0 0
476486
4550 20 1 0 0>;
477-
strategy_temp_normal_high = <4540 40 0 0 0
487+
strategy_temp_normal_high = <4540 50 0 0 0
488+
4540 40 0 0 0
478489
4540 30 0 0 0
479490
4550 24 1 0 0>;
480491
strategy_temp_warm = <4130 20 1 0 0>;
@@ -486,7 +497,8 @@
486497
strategy_temp_little_cool = <4230 20 1 0 0>;
487498
strategy_temp_little_cool_high =<4550 20 1 0 0>;
488499
strategy_temp_normal_low = <4550 20 1 0 0>;
489-
strategy_temp_normal_high = <4550 24 1 0 0>;
500+
strategy_temp_normal_high = <4540 30 0 0 0
501+
4550 24 1 0 0>;
490502
strategy_temp_warm = <4130 20 1 0 0>;
491503
};
492504
};
@@ -620,7 +632,8 @@
620632
11000 4485 2000 0 0
621633
11000 4485 1500 0 0
622634
11000 4495 1000 1 0>;
623-
strategy_temp_warm = <11000 4120 2000 0 0
635+
strategy_temp_warm = <11000 4120 2350 0 0
636+
11000 4120 2000 0 0
624637
11000 4120 1500 0 0
625638
11000 4130 1000 1 0>;
626639
};
@@ -669,7 +682,8 @@
669682
11000 4485 2000 0 0
670683
11000 4485 1500 0 0
671684
11000 4495 1000 1 0>;
672-
strategy_temp_warm = <11000 4120 2000 0 0
685+
strategy_temp_warm = <11000 4120 2350 0 0
686+
11000 4120 2000 0 0
673687
11000 4120 1500 0 0
674688
11000 4130 1000 1 0>;
675689
};
@@ -714,7 +728,8 @@
714728
11000 4485 2000 0 0
715729
11000 4485 1500 0 0
716730
11000 4495 1000 1 0>;
717-
strategy_temp_warm = <11000 4120 2000 0 0
731+
strategy_temp_warm = <11000 4120 2350 0 0
732+
11000 4120 2000 0 0
718733
11000 4120 1500 0 0
719734
11000 4130 1000 1 0>;
720735
};
@@ -742,11 +757,16 @@
742757
strategy_soc_range_mid_high { /* 76 ~ 85 */
743758
strategy_temp_little_cold = <11000 4490 1000 1 0>;
744759
strategy_temp_cool = <11000 4080 1000 1 0>;
745-
strategy_temp_little_cool = <11000 4230 1000 1 0>;
746-
strategy_temp_little_cool_high =<11000 4510 1000 1 0>;
747-
strategy_temp_normal_low = <11000 4500 1500 0 0
760+
strategy_temp_little_cool = <11000 4220 1500 0 0
761+
11000 4230 1000 1 0>;
762+
strategy_temp_little_cool_high =<11000 4500 1500 0 0
763+
11000 4500 1200 0 0
748764
11000 4510 1000 1 0>;
749-
strategy_temp_normal_high = <11000 4485 1500 0 0
765+
strategy_temp_normal_low = <11000 4500 2000 0 0
766+
11000 4500 1500 0 0
767+
11000 4510 1000 1 0>;
768+
strategy_temp_normal_high = <11000 4485 2000 0 0
769+
11000 4485 1500 0 0
750770
11000 4495 1000 1 0>;
751771
strategy_temp_warm = <11000 4130 1000 1 0>;
752772
};
@@ -768,24 +788,24 @@
768788
};
769789

770790
&oplus_chg_wired {
771-
oplus_spec,led_on-fccmax-ma = <0 828 2485 3300 3300 3300 3300 1000 0>;
791+
oplus_spec,led_on-fccmax-ma = <0 828 1656 3300 3300 3300 3300 1000 0>;
772792
oplus_spec,fccmax-ma-lv = <
773793
0 1707 2200 2200 2200 2200 2200 2200 0 /* OPLUS_WIRED_CHG_MODE_UNKNOWN */
774794
0 600 600 600 600 600 600 600 0 /* OPLUS_WIRED_CHG_MODE_SDP */
775795
0 828 1600 1600 1600 1600 1600 1600 0 /* OPLUS_WIRED_CHG_MODE_CDP */
776-
0 828 2200 2200 2200 2200 2200 2200 0 /* OPLUS_WIRED_CHG_MODE_DCP */
796+
0 828 1656 2200 2200 2200 2200 2200 0 /* OPLUS_WIRED_CHG_MODE_DCP */
777797
0 1200 3600 3600 3600 3600 2200 2200 0 /* OPLUS_WIRED_CHG_MODE_VOOC */
778-
0 828 2485 3300 3300 3300 3300 3300 0 /* OPLUS_WIRED_CHG_MODE_QC */
779-
0 828 2485 3300 3300 3300 3300 3300 0 /* OPLUS_WIRED_CHG_MODE_PD */
798+
0 828 1656 3300 3300 3300 3300 3300 0 /* OPLUS_WIRED_CHG_MODE_QC */
799+
0 828 1656 3300 3300 3300 3300 3300 0 /* OPLUS_WIRED_CHG_MODE_PD */
780800
>;
781801
oplus_spec,fccmax-ma-hv = <
782802
0 1707 2200 2200 2200 2200 2200 2200 0 /* OPLUS_WIRED_CHG_MODE_UNKNOWN */
783803
0 436 600 600 600 600 600 500 0 /* OPLUS_WIRED_CHG_MODE_SDP */
784-
0 436 828 1600 1600 1600 1600 1000 0 /* OPLUS_WIRED_CHG_MODE_CDP */
785-
0 436 828 1656 2200 2200 2200 1000 0 /* OPLUS_WIRED_CHG_MODE_DCP */
804+
0 436 828 1242 1600 1600 1600 1000 0 /* OPLUS_WIRED_CHG_MODE_CDP */
805+
0 436 828 1242 1656 2200 2200 1000 0 /* OPLUS_WIRED_CHG_MODE_DCP */
786806
0 1200 3600 3600 3600 3600 2200 2200 0 /* OPLUS_WIRED_CHG_MODE_VOOC */
787-
0 436 828 1656 2485 3300 3300 1000 0 /* OPLUS_WIRED_CHG_MODE_QC */
788-
0 436 828 1656 2485 3300 3300 1000 0 /* OPLUS_WIRED_CHG_MODE_PD */
807+
0 436 828 1242 1656 2485 3300 1000 0 /* OPLUS_WIRED_CHG_MODE_QC */
808+
0 436 828 1242 1656 2485 3300 1000 0 /* OPLUS_WIRED_CHG_MODE_PD */
789809
>;
790810
};
791811

@@ -796,6 +816,10 @@
796816
oplus_spec,fv-mv = <4510 4510 4510 4510 4510 4510 4495 4130 4130>;
797817
oplus_spec,sw-fv-mv = <4460 4460 4460 4460 4460 4460 4445 4080 4080>;
798818
oplus_spec,sw-over-fv-mv = <4518 4518 4518 4518 4518 4518 4503 4138 4138>;
819+
oplus_spec,wired-vbatdet-mv = <0 4210 4310 4410 4410 4410 4395 4030 0>;
820+
oplus_spec,dec_step = <20>;
821+
oplus_spec,dec-vol-cc-full-thr = <0 200 400 600 800 1000>;
822+
oplus_spec,dec-vol-fv-full-mv = <0 20 40 40 60 60>;
799823

800824
oplus_spec,vbat_uv_thr_mv = <2750>;
801825
oplus_spec,vbat_charging_uv_thr_mv = <2650>;
@@ -821,3 +845,8 @@
821845
1050 1050 1050
822846
950 950 950>;
823847
};
848+
849+
&oplus_monitor {
850+
track,nominal_qmax1 = <9000>;
851+
track,nominal_fcc1 = <8760>;
852+
};

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/vw/oplus-chg-vw-common.dtsi‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
oplus_spec,usbtemp_cool_down_recover_ntc_high = <60>;
5151
oplus_spec,usbtemp_cool_down_recover_gap_low = <6>;
5252
oplus_spec,usbtemp_cool_down_recover_gap_high = <15>;
53-
oplus_spec,usbtemp_otg_cc_boot_current_limit = <1300>;
53+
oplus_spec,usbtemp_otg_cc_boot_current_limit = <1500>;
5454

5555
oplus_virtual_buck: oplus,virtual_buck {
5656
compatible = "oplus,virtual_buck";
@@ -406,9 +406,6 @@
406406

407407
oplus_chg_comm: oplus,comm {
408408
compatible = "oplus,common-charge";
409-
oplus_spec,dec_step = <20>;
410-
oplus_spec,dec-vol-cc-full-thr = <0 200 400 600 800 1000>;
411-
oplus_spec,dec-vol-fv-full-mv = <0 20 40 40 60 60>;
412409
oplus_spec,batt-them-thr = <(-100) 0 50 120 160 350 450 530>;
413410
oplus_spec,removed_bat_decidegc = <390>; /*-39 degree*/
414411

@@ -418,9 +415,8 @@
418415
oplus_spec,non-standard-sw-fv-mv = <3930>;
419416
oplus_spec,non-standard-fv-mv = <3980>;
420417
oplus_spec,non-standard-hw-fv-inc-mv = <18>;
421-
oplus_spec,non-standard-sw-over-fv-mv = <3990>;
418+
oplus_spec,non-standard-sw-over-fv-mv = <3988>;
422419
oplus_spec,non-standard-vbatdet-mv = <3680>;
423-
oplus_spec,wired-vbatdet-mv = <0 4210 4310 4410 4410 4410 4395 4030 0>;
424420
oplus_spec,fcc-gear-shake-mv = <400 400 400 300 300 180 180 180 180>;
425421
oplus_spec,vbatt-ov-thr-mv = <4600>;
426422
oplus_spec,sw_check_full_cnt = <12>;
@@ -460,8 +456,6 @@
460456
track,wired_fast_chg_scheme = <2>;
461457

462458
track,gauge_status_ctrl;
463-
track,nominal_qmax1 = <9000>;
464-
track,nominal_fcc1 = <8760>;
465459
track,external_gauge_num = <1>;
466460
track,low_soc_monitor_ctrl;
467461

@@ -506,8 +500,8 @@
506500
405 440 CP_CURR_LIMIT_7BIT_2_0A 3 2>;
507501
oplus,plc_strategy-data = <&buck_simple_strategy &cp_2t1_simple_strategy &cp_1t1_simple_strategy>;
508502
oplus,plc_strategy-names = "default", "svooc", "vooc";
509-
oplus,cp_cooldown_limit_percent_75 = <CP_CURR_LIMIT_7BIT_8_0A>;
510-
oplus,cp_cooldown_limit_percent_85 = <CP_CURR_LIMIT_7BIT_4_0A>;
503+
oplus,cp_cooldown_limit_percent_75 = <CP_CURR_LIMIT_7BIT_4_0A>;
504+
oplus,cp_cooldown_limit_percent_85 = <CP_CURR_LIMIT_7BIT_2_0A>;
511505

512506
oplus_virtual_vphy: oplus,virtual_vphy {
513507
compatible = "oplus,virtual_vphy";

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/vw/oplus-chg-vw-sili.dtsi‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
deep_spec,support;
2424
deep_spec,uv_thr = <2750>;
2525
deep_spec,count_thr = <50>;
26-
deep_spec,vbat_soc = <20>;
26+
deep_spec,vbat_soc = <80>;
2727
deep_spec,count_step = <0 10 0
2828
350 12 1
2929
450 15 2
@@ -44,14 +44,14 @@
4444
deep_spec,ddbc_curve {
4545
oplus,temp_type = <OPLUS_STRATEGY_USE_BATT_TEMP>;
4646
oplus,temp_range = <(-100) 0 200>;
47-
deep_spec,ddbc_temp_cold = <500 3310 5
48-
10000 3260 2>;
49-
deep_spec,ddbc_temp_cool = <500 3310 5
50-
10000 3260 2>;
51-
deep_spec,ddbc_temp_normal = <500 3310 5
52-
10000 3260 2>;
53-
deep_spec,ddbc_temp_warm = <500 3310 5
54-
10000 3260 2>;
47+
deep_spec,ddbc_temp_cold = <500 3250 5
48+
10000 3200 2>;
49+
deep_spec,ddbc_temp_cool = <500 3250 5
50+
10000 3200 2>;
51+
deep_spec,ddbc_temp_normal = <500 3250 5
52+
10000 3200 2>;
53+
deep_spec,ddbc_temp_warm = <500 3250 5
54+
10000 3200 2>;
5555
};
5656
ddrc_strategy {
5757
oplus,temp_type = <OPLUS_STRATEGY_USE_BATT_TEMP>;

0 commit comments

Comments
 (0)