Skip to content

Commit 3220982

Browse files
author
pswbuild
committed
Synchronize code for OnePlus CPH2649_16.0.1.304(EX01) CPH2653_16.0.1.304(EX01) CPH2655_16.0.1.304(EX01) PJZ110_16.0.1.303(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 f00c62f commit 3220982

304 files changed

Lines changed: 30602 additions & 33714 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.dtsi‎

100644100755
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,10 @@
404404
OPLUS_IC_FUNC_GAUGE_SET_LAST_CC
405405
OPLUS_IC_FUNC_GAUGE_GET_LAST_CC
406406
OPLUS_IC_FUNC_GAUGE_GET_REAL_TIME_CURR
407+
OPLUS_IC_FUNC_GAUGE_GET_DEC_FG_TYPE
408+
OPLUS_IC_FUNC_GAUGE_GET_DEC_CV_SOH
409+
OPLUS_IC_FUNC_GAUGE_SET_VCT
410+
OPLUS_IC_FUNC_GAUGE_GET_VCT
407411
OPLUS_IC_FUNC_GAUGE_GET_GAUGE_R_INFO
408412
OPLUS_IC_FUNC_GAUGE_GET_BATT_SOC_CENTI
409413
>;

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

Lines changed: 1867 additions & 1867 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
CHG_PROTOCOL_PD
1010
CHG_PROTOCOL_PPS
1111
CHG_PROTOCOL_VOOC>;
12-
oplus,protocol_wait_list = <CHG_PROTOCOL_VOOC 1000>;
1312
};
1413

1514
&battery_charger {

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@
420420
OPLUS_IC_FUNC_GAUGE_SET_LAST_CC
421421
OPLUS_IC_FUNC_GAUGE_GET_LAST_CC
422422
OPLUS_IC_FUNC_GAUGE_GET_CHEM_ID
423-
OPLUS_IC_FUNC_GAUGE_GET_GAUGE_R_INFO
424423
>;
425424
virqs = <
426425
OPLUS_IC_VIRQ_ERR
@@ -682,7 +681,6 @@
682681
oplus_spec,current_limit_of_drop_soc_2 = <350>;
683682
oplus_spec,volt_of_fast_drop_soc_1 = <2900>;
684683
oplus_spec,support_uisoc_low_battery_control;
685-
oplus_spec,support_gauge_r_track;
686684

687685
oplus_spec,vbat_uv_thr_mv = <3000>;
688686
oplus_spec,vbat_charging_uv_thr_mv = <2900>;
@@ -705,8 +703,6 @@
705703

706704
oplus,ui_soc_2_voltage_comp_mv = <30>;
707705
oplus,chg_shutdown_max_mv = <3000>;
708-
709-
oplus_spec,batt_full_time = <300>;
710706
};
711707

712708
oplus_monitor: oplus,monitor {
@@ -1067,13 +1063,6 @@
10671063
oplus,bq28z610_afi_buf = /bits/ 8 <
10681064
/* checksum data_len data+ */
10691065
0xfd 0x04 0xf4 0x46 0xc8 0x00 /* Charge Term Taper Current 200mA */
1070-
0x24 0x03 0x90 0x45 0x06 /* MIN_RES_POINTS 6 */
1071-
0x24 0x03 0x91 0x45 0x05 /* RA_MAX_DELTA 5 */
1072-
0xd8 0x03 0xe8 0x45 0xfa /* SOH_LOAD_RATE 250 */
1073-
0x2 0x04 0x94 0x45 0x25 0xff /* RES_PARA_FILTER 65317 */
1074-
0x3d 0x04 0x96 0x45 0xed 0xfa /* RA_PARA_FILTER 64237 */
1075-
0xeb 0x03 0x89 0x45 0x46 /* MIN_DOD_RES 70 */
1076-
0x73 0x04 0x8e 0x45 0xb6 0x3 /* RA_PARA_FILTER 950 */
10771066
>;
10781067

10791068
oplus,ic_type = <OPLUS_CHG_IC_GAUGE>;
@@ -1702,7 +1691,6 @@
17021691
oplus,default_protocol_list = <CHG_PROTOCOL_UFCS
17031692
CHG_PROTOCOL_PD
17041693
CHG_PROTOCOL_VOOC>;
1705-
oplus,protocol_wait_list = <CHG_PROTOCOL_VOOC 1000>;
17061694
};
17071695

17081696
oplus_ufcs_virtual_cp: oplus,ufcs_virtual_cp {

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@
418418
OPLUS_IC_FUNC_GAUGE_GET_DEC_CV_SOH
419419
OPLUS_IC_FUNC_GAUGE_SET_VCT
420420
OPLUS_IC_FUNC_GAUGE_GET_VCT
421+
OPLUS_IC_FUNC_GAUGE_GET_BATT_SOC_CENTI
421422
>;
422423
virqs = <
423424
OPLUS_IC_VIRQ_ERR
@@ -584,9 +585,6 @@
584585

585586
oplus_spec,sw_check_full_cnt = <12>;
586587

587-
oplus,smooth_switch;
588-
oplus,reserve_chg_soc = <2>;
589-
590588
oplus,ui_soc_2_voltage_comp_mv = <30>;
591589
oplus,chg_shutdown_max_mv = <3000>;
592590

@@ -601,6 +599,18 @@
601599
oplus_spec,current_limit_of_drop_soc_2 = <700>;
602600
oplus_spec,volt_of_fast_drop_soc_1 = <2900>;
603601
oplus_spec,support_uisoc_low_battery_control;
602+
603+
oplus_spec,batt_full_time = <60>;
604+
oplus_spec,batt_full_low_soc = <99>;
605+
oplus_spec,batt_full_low_soc_time = <600>;
606+
oplus_spec,smooth_strategy_name = "bs";
607+
smooth_strategy {
608+
oplus_spec,reserve_table_centipercent =
609+
/* start(%) end(%) dischg_reserve(0.01%) full_reserve(0.01%) chg_reserve(0.01%) chg_split(%) */
610+
<0 20 0 0 200 100>,
611+
<21 99 200 0 200 100>,
612+
<100 100 200 0 200 100>;
613+
};
604614
};
605615

606616
oplus_vooc: oplus,vooc {

0 commit comments

Comments
 (0)