Skip to content

Commit e3df006

Browse files
author
pswbuild
committed
Synchronize code for OnePlus PJZ110_16.0.0.212(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 a31b38f commit e3df006

53 files changed

Lines changed: 652 additions & 595 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/build/oplus_setup.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ function init_build_environment() {
99
export OPLUS_VND_BUILD_PLATFORM=SM8750
1010
export ANDROID_PRODUCT_OUT=${TOPDIR}/out/target/product/$variants_platform
1111
export TARGET_BOARD_PLATFORM=$variants_platform
12-
source vendor/oplus/kernel/prebuilt/vendorsetup.sh
1312

1413
ACKDIR=${TOPDIR}/kernel_platform
1514
TOOLS=${ACKDIR}/oplus/tools

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,8 @@
315315
oplus,gauge_stuck_time = <50>;
316316
oplus,smooth_switch;
317317
oplus,reserve_chg_soc = <1>;
318+
319+
oplus_spec,batt_full_time = <300>;
318320
};
319321

320322
oplus_monitor: oplus,monitor {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//ifdef OPLUS_FEATURE_CHG_BASIC
22
&oplus_mms_gauge {
33
silicon_p_770 {
4-
oplus,fcl_support;
5-
oplus,fcl_index = <0>;
6-
oplus,vb_offset = <0>;
74
deep_spec,support;
85
deep_spec,uv_thr = <2800>;
96
deep_spec,count_thr = <50>;
@@ -175,4 +172,4 @@
175172
};
176173
};
177174
};
178-
//#endif
175+
//#endif

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
//ifdef OPLUS_FEATURE_CHG_BASIC
22
&oplus_chg_comm {
33
silicon_p_770 {
4-
oplus_spec,dec_step = <20>;
5-
oplus_spec,dec-vol-cc-full-thr = <0 400 600 800 1000 1200>;
6-
oplus_spec,dec-vol-fv-full-mv = <0 20 20 40 40 40>;
4+
oplus_spec,dec-vol-cc-thr = <0 400 800>;
5+
oplus_spec,dec-vol-fv-mv = <0 0 0 0 0 0 0 0 0
6+
20 20 20 20 20 20 20 0 0
7+
40 40 40 40 40 40 20 0 0>;
8+
oplus_spec,dec-vol-wired-ffc-mv = <0 0 0
9+
20 20 20
10+
40 40 20>;
11+
oplus_spec,dec-vol-wls-ffc-mv = <0 0 0
12+
20 20 20
13+
40 40 20>;
714
oplus_spec,batt-them-thr = <(-100) 0 50 120 160 350 450 530>;
815
oplus_spec,iterm-ma = <150>;
916
oplus_spec,fv-mv = <4500 4500 4500 4500 4500 4500 4475 4130 4130>;

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@
109109
oplus,gauge_ic = <&oplus_virtual_gauge>;
110110
oplus,topic-update-interval = <5000>;
111111
oplus,support_subboard_ntc;
112-
oplus,fcl_support;
113-
oplus,fcl_index = <0>;
114-
oplus,vb_offset = <0>;
115112

116113
deep_spec,support;
117114
deep_spec,uv_thr = <2800>;
@@ -663,9 +660,16 @@
663660

664661
oplus_chg_comm: oplus,comm {
665662
compatible = "oplus,common-charge";
666-
oplus_spec,dec_step = <20>;
667-
oplus_spec,dec-vol-cc-full-thr = <0 400 600 800 1000 1200>;
668-
oplus_spec,dec-vol-fv-full-mv = <0 20 20 40 40 40>;
663+
oplus_spec,dec-vol-cc-thr = <0 400 800>;
664+
oplus_spec,dec-vol-fv-mv = <0 0 0 0 0 0 0 0 0
665+
20 20 20 20 20 20 20 0 0
666+
40 40 40 40 40 40 20 0 0>;
667+
oplus_spec,dec-vol-wired-ffc-mv = <0 0 0
668+
20 20 20
669+
40 40 20>;
670+
oplus_spec,dec-vol-wls-ffc-mv = <0 0 0
671+
20 20 20
672+
40 40 20>;
669673
oplus_spec,batt-them-thr = <(-100) 0 50 120 160 350 450 530>;
670674
oplus_spec,iterm-ma = <146>;
671675
oplus_spec,fv-mv = <4500 4500 4500 4500 4500 4500 4475 4130 4130>;

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_chg/oplus-chg-23893-silicon-deep-discharge-770.dtsi‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//ifdef OPLUS_FEATURE_CHG_BASIC
22
&oplus_mms_gauge {
33
silicon_p_770 {
4-
oplus,fcl_support;
5-
oplus,fcl_index = <0>;
6-
oplus,vb_offset = <0>;
74
deep_spec,support;
85
deep_spec,uv_thr = <2800>;
96
deep_spec,count_thr = <50>;

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

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

1415
&battery_charger {

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@
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
423424
>;
424425
virqs = <
425426
OPLUS_IC_VIRQ_ERR
@@ -681,6 +682,7 @@
681682
oplus_spec,current_limit_of_drop_soc_2 = <350>;
682683
oplus_spec,volt_of_fast_drop_soc_1 = <2900>;
683684
oplus_spec,support_uisoc_low_battery_control;
685+
oplus_spec,support_gauge_r_track;
684686

685687
oplus_spec,vbat_uv_thr_mv = <3000>;
686688
oplus_spec,vbat_charging_uv_thr_mv = <2900>;
@@ -703,6 +705,8 @@
703705

704706
oplus,ui_soc_2_voltage_comp_mv = <30>;
705707
oplus,chg_shutdown_max_mv = <3000>;
708+
709+
oplus_spec,batt_full_time = <300>;
706710
};
707711

708712
oplus_monitor: oplus,monitor {
@@ -1063,6 +1067,13 @@
10631067
oplus,bq28z610_afi_buf = /bits/ 8 <
10641068
/* checksum data_len data+ */
10651069
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 */
10661077
>;
10671078

10681079
oplus,ic_type = <OPLUS_CHG_IC_GAUGE>;
@@ -1691,6 +1702,7 @@
16911702
oplus,default_protocol_list = <CHG_PROTOCOL_UFCS
16921703
CHG_PROTOCOL_PD
16931704
CHG_PROTOCOL_VOOC>;
1705+
oplus,protocol_wait_list = <CHG_PROTOCOL_VOOC 1000>;
16941706
};
16951707

16961708
oplus_ufcs_virtual_cp: oplus,ufcs_virtual_cp {

0 commit comments

Comments
 (0)