Skip to content

Commit 5660ca5

Browse files
author
pswbuild
committed
Synchronize code for OnePlus CPH2649_16.0.2.402(EX01) CPH2653_16.0.2.402(EX01) CPH2655_16.0.2.403(EX01) PJZ110_16.0.2.403(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/opensource/video-driver: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 3220982 commit 5660ca5

189 files changed

Lines changed: 7261 additions & 13537 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/oplus/config/modules.ext.5.15.oplus‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎kernel_platform/oplus/config/modules.ext.6450oplus‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎kernel_platform/oplus/config/modules.ext.oplus‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@
3333
../vendor/oplus/kernel/power/power_hook
3434
../vendor/oplus/kernel/power/rpmh
3535
../vendor/oplus/kernel/power/subsys_sleep_monitor/bazel
36+
../vendor/oplus/kernel/patch

‎kernel_platform/qcom/opensource/devicetree/oplus/erhai_overlay_common.dtsi‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,16 @@
150150
&qdss_apps_mem {
151151
status = "disabled";
152152
};
153+
154+
&soc {
155+
oplus_mm_config: oplus,mm_config {
156+
compatible = "oplus,mm_osvelte-config";
157+
ram-8g {
158+
oplus_bsp_uxmem_opt {
159+
page_pool_order0_mb = <192>;
160+
page_pool_order1_mb = <8>;
161+
};
162+
};
163+
};
164+
};
165+

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@
299299
0xf8 0xfb 0xff 0xee 0xdf 0xee 0xff 0x1f
300300
0x88 0xeb 0xff 0xee 0xdf 0xee 0xff 0x1f
301301
0x8c 0xeb 0x97 0x27 0x2f 0xff 0x5c 0xc4
302-
0x97 0x23 0x2f 0xff 0x94 0xcc 0x97 0x23
302+
0x97 0x23 0x2f 0xff 0x93 0xcc 0x97 0x23
303303
0xfb 0xff 0x29 0xf8 0xbd 0xc4 0xfb 0xf7
304304
0xe5 0xef 0xc4 0xef 0xfc 0xfb 0xe4 0xef
305305
0xc4 0xef 0xff 0x1f 0x9e 0xeb 0x33 0xf8
@@ -845,7 +845,7 @@
845845
0x71 0x9b 0x03 0xf4 0xf5 0xef 0xc3 0x87
846846
0x2f 0xeb 0xf1 0xef 0xfe 0x15 0x07 0x80
847847
0x00 0x1c 0x78 0x0a 0x93 0xef 0x9d 0x6c
848-
0x31 0x87 0x3d 0x9b 0xfc 0xf7 0x94 0xcc
848+
0x31 0x87 0x3d 0x9b 0xfc 0xf7 0x93 0xcc
849849
0xfc 0xfb 0xff 0xcc 0xff 0xd4 0x97 0x23
850850
0xfb 0xff 0x6f 0xeb 0xff 0xff 0xff 0xdf
851851
0xfb 0xff 0xff 0xff 0x63 0xff 0xff 0xff
@@ -3057,7 +3057,7 @@
30573057
0xf9 0xb7 0xbf 0xc6 0x93 0xa7 0xf8 0xf3
30583058
0xec 0x8b 0xfe 0x15 0x0c 0xfe 0xfa 0x9b
30593059
0xfd 0xf7 0x38 0xdc 0xd8 0x27 0x5e 0xff
3060-
0xf4 0xc6 0xfc 0xf7 0x9c 0x1b 0x18 0xfc
3060+
0xf4 0xc6 0xfc 0xf7 0x9c 0x1b 0x54 0xf2
30613061
0xdf 0x7a 0xbe 0xc6 0xf2 0xf7 0xec 0x8a
30623062
0xde 0x1b 0x78 0xfd 0xfa 0x9a 0xf7 0xf7
30633063
0xe5 0x70 0xfe 0x15 0x78 0xec 0xfb 0x9b
@@ -4097,8 +4097,8 @@
40974097
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
40984098
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
40994099
0xff 0xff 0xff 0xff 0xff 0xff 0xff 0xff
4100-
0xb1 0xaa 0xe9 0x96 0x94 0xff 0xff 0xff
4101-
0xc6 0x96 0x1c 0x27 0x00 0x00 0x00 0x00
4100+
0xb1 0xaa 0xe9 0x96 0x93 0xff 0xff 0xff
4101+
0xc8 0xdd 0x1c 0x27 0x00 0x00 0x00 0x00
41024102
>;
41034103
};
41044104
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
oplus,cp_ic = <&oplus_ufcs_virtual_cp>;
3030
oplus,dpdm_switch_ic = <&oplus_adsp_dpdm_switch>;
3131

32+
oplus,curr_max_ma_percent = <3500 /* 75% ibus */
33+
2000 /* 85% ibus */>;
34+
3235
oplus,target_vbus_mv = <11000>;
3336
oplus,curr_max_ma = <3000>;
3437

@@ -389,6 +392,9 @@
389392
};
390393
};
391394
silicon_p_770 {
395+
oplus,curr_max_ma_percent = <3500 /* 75% ibus */
396+
2000 /* 85% ibus */>;
397+
392398
oplus,target_vbus_mv = <11000>;
393399
oplus,curr_max_ma = <3000>;
394400

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@
163163

164164
&oplus_ufcs_charge {
165165
silicon_p_770 {
166+
oplus,curr_max_ma_percent = <3500 /* 75% ibus */
167+
2000 /* 85% ibus */>;
168+
166169
oplus,adsp_ufcs_project;
167170
oplus,ufcs_need_reset_adapter;
168171
oplus,target_vbus_mv = <11000>;

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

100755100644
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,6 +1078,9 @@
10781078
oplus,cp_ic = <&oplus_ufcs_virtual_cp>;
10791079
oplus,dpdm_switch_ic = <&oplus_adsp_dpdm_switch>;
10801080

1081+
oplus,curr_max_ma_percent = <3500 /* 75% ibus */
1082+
2000 /* 85% ibus */>;
1083+
10811084
oplus,adsp_ufcs_project;
10821085
oplus,ufcs_boot_time_retry = <10>;
10831086
oplus,impedance_unit = <&oplus_ufcs_impedance_unit>;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
oplus,cp_ic = <&oplus_ufcs_virtual_cp>;
3838
oplus,dpdm_switch_ic = <&oplus_adsp_dpdm_switch>;
3939

40+
oplus,curr_max_ma_percent = <3500 /* 75% ibus */
41+
2000 /* 85% ibus */>;
42+
4043
oplus,target_vbus_mv = <11000>;
4144
oplus,curr_max_ma = <5000>;
4245

@@ -518,6 +521,9 @@
518521
};
519522

520523
silicon_p_770 {
524+
oplus,curr_max_ma_percent = <3500 /* 75% ibus */
525+
2000 /* 85% ibus */>;
526+
521527
oplus,target_vbus_mv = <11000>;
522528
oplus,curr_max_ma = <5000>;
523529

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

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
oplus,gauge_ic = <&oplus_virtual_gauge>;
9393
oplus,topic-update-interval = <5000>;
9494
oplus,support_subboard_ntc;
95+
oplus,fcl_support;
96+
oplus,fcl_index = <0>;
97+
oplus,vb_offset = <0>;
9598

9699
deep_spec,support;
97100
deep_spec,uv_thr = <3000>;
@@ -420,6 +423,11 @@
420423
OPLUS_IC_FUNC_GAUGE_SET_LAST_CC
421424
OPLUS_IC_FUNC_GAUGE_GET_LAST_CC
422425
OPLUS_IC_FUNC_GAUGE_GET_CHEM_ID
426+
OPLUS_IC_FUNC_GAUGE_GET_DEC_FG_TYPE
427+
OPLUS_IC_FUNC_GAUGE_GET_DEC_CV_SOH
428+
OPLUS_IC_FUNC_GAUGE_SET_VCT
429+
OPLUS_IC_FUNC_GAUGE_GET_VCT
430+
OPLUS_IC_FUNC_GAUGE_GET_GAUGE_R_INFO
423431
>;
424432
virqs = <
425433
OPLUS_IC_VIRQ_ERR
@@ -632,13 +640,9 @@
632640

633641
oplus_chg_comm: oplus,comm {
634642
compatible = "oplus,common-charge";
635-
oplus_spec,dec-vol-cc-thr = <0 400 800>;
636-
oplus_spec,dec-vol-fv-mv = <0 0 0 0 0 0 0 0 0
637-
20 20 20 20 20 20 20 0 0
638-
40 40 40 40 40 40 20 0 0>;
639-
oplus_spec,dec-vol-wired-ffc-mv = <0 0 0
640-
20 20 20
641-
40 40 20>;
643+
oplus_spec,dec_step = <20>;
644+
oplus_spec,dec-vol-cc-full-thr = <0 400 600 800 1000 1200>;
645+
oplus_spec,dec-vol-fv-full-mv = <0 20 20 40 40 40>;
642646
oplus_spec,batt-them-thr = <(-100) 0 50 120 160 350 450 530>;
643647
oplus_spec,iterm-ma = <155>;
644648
oplus_spec,fv-mv = <4500 4500 4500 4500 4500 4500 4475 4130 4130>;
@@ -681,6 +685,7 @@
681685
oplus_spec,current_limit_of_drop_soc_2 = <350>;
682686
oplus_spec,volt_of_fast_drop_soc_1 = <2900>;
683687
oplus_spec,support_uisoc_low_battery_control;
688+
oplus_spec,support_gauge_r_track;
684689

685690
oplus_spec,vbat_uv_thr_mv = <3000>;
686691
oplus_spec,vbat_charging_uv_thr_mv = <2900>;
@@ -703,20 +708,23 @@
703708

704709
oplus,ui_soc_2_voltage_comp_mv = <30>;
705710
oplus,chg_shutdown_max_mv = <3000>;
711+
712+
oplus_spec,batt_full_time = <300>;
706713
};
707714

708715
oplus_monitor: oplus,monitor {
709716
compatible = "oplus,monitor";
710717
oplus,topic-update-interval = <60000>;
711718

712-
track,fast_chg_break_t_thd = <1400>;
719+
track,fast_chg_break_t_thd = <2500>;
713720
track,general_chg_break_t_thd = <300>;
714721
track,voocphy_type = <2>;
715722
track,wired_max_power = <100000>;
716723
track,wired_fast_chg_scheme = <0>;
717724

718725
track,gauge_status_ctrl;
719726
track,external_gauge_num = <1>;
727+
track,track_ver = <TRACK_VER_4_0>;
720728
};
721729

722730
oplus_vooc: oplus,vooc {
@@ -1063,6 +1071,13 @@
10631071
oplus,bq28z610_afi_buf = /bits/ 8 <
10641072
/* checksum data_len data+ */
10651073
0xfd 0x04 0xf4 0x46 0xc8 0x00 /* Charge Term Taper Current 200mA */
1074+
0x24 0x03 0x90 0x45 0x06 /* MIN_RES_POINTS 6 */
1075+
0x24 0x03 0x91 0x45 0x05 /* RA_MAX_DELTA 5 */
1076+
0xd8 0x03 0xe8 0x45 0xfa /* SOH_LOAD_RATE 250 */
1077+
0x2 0x04 0x94 0x45 0x25 0xff /* RES_PARA_FILTER 65317 */
1078+
0x3d 0x04 0x96 0x45 0xed 0xfa /* RA_PARA_FILTER 64237 */
1079+
0xeb 0x03 0x89 0x45 0x46 /* MIN_DOD_RES 70 */
1080+
0x73 0x04 0x8e 0x45 0xb6 0x3 /* RA_PARA_FILTER 950 */
10661081
>;
10671082

10681083
oplus,ic_type = <OPLUS_CHG_IC_GAUGE>;

0 commit comments

Comments
 (0)