Skip to content

Commit c368834

Browse files
author
pswbuild
committed
Synchronize code for OnePlus CPH2745_16.0.1.303(EX01) CPH2747_16.0.1.303(EX01)
Based on QCOM release TAG: kernel/build:AU_LINUX_KERNEL.PLATFORM.5.0.R1.00.00.00.099.064 platform/vendor/nxp/opensource/driver:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.089 platform/vendor/opensource/camera-devicetree:AU_TECHPACK_CAMERA.LA.6.0.R1.00.00.00.000.061 platform/vendor/opensource/camera-kernel:AU_TECHPACK_CAMERA.LA.6.0.R1.00.00.00.000.061 platform/vendor/opensource/dataipa:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078 platform/vendor/opensource/display-devicetree:AU_TECHPACK_DISPLAY.LA.6.0.R1.00.00.00.000.071 platform/vendor/opensource/display-drivers:AU_TECHPACK_DISPLAY.LA.6.0.R1.00.00.00.000.071 platform/vendor/opensource/eva-devicetree:AU_TECHPACK_CV.LA.3.0.R1.00.00.00.000.034 platform/vendor/opensource/eva-kernel:AU_TECHPACK_CV.LA.3.0.R1.00.00.00.000.034 platform/vendor/opensource/mm-devicetree:AU_TECHPACK_DISPLAY.LA.6.0.R1.00.00.00.000.071 platform/vendor/opensource/mm-drivers:AU_TECHPACK_DISPLAY.LA.6.0.R1.00.00.00.000.071 platform/vendor/opensource/mmrm-devicetree:AU_TECHPACK_VIDEO_HANDSET.LA.1.0.R1.00.00.00.000.061 platform/vendor/opensource/mmrm-driver:AU_TECHPACK_VIDEO_HANDSET.LA.1.0.R1.00.00.00.000.061 platform/vendor/opensource/synx-kernel:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078 platform/vendor/opensource/video-devicetree:AU_TECHPACK_VIDEO_HANDSET.LA.1.0.R1.00.00.00.000.059 platform/vendor/opensource/video-driver:AU_TECHPACK_VIDEO_HANDSET.LA.1.0.R1.00.00.00.000.047 platform/vendor/proprietary/mm-devicetree:AU_TECHPACK_DISPLAY.LA.6.0.R1.00.00.00.000.071 platform/vendor/qcom-opensource/bt-devicetree:AU_TECHPACK_BTFM.LA.2.0.R1.00.00.00.000.031 platform/vendor/qcom-opensource/bt-kernel:AU_TECHPACK_BTFM.LA.2.0.R1.00.00.00.000.031 platform/vendor/qcom-opensource/data-devicetree:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078 platform/vendor/qcom-opensource/data-kernel:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.102 platform/vendor/qcom-opensource/devicetree:AU_LINUX_KERNEL.PLATFORM.5.0.R1.00.00.00.099.064 platform/vendor/qcom-opensource/eSE-devicetree:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078 platform/vendor/qcom-opensource/nfc-devicetree:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.089 platform/vendor/qcom-opensource/synx-devicetree:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.097 platform/vendor/qcom-opensource/wlan/fw-api:AU_TECHPACK_WLAN.LA.2.0.R3.00.00.00.000.037 platform/vendor/qcom-opensource/wlan/platform:AU_TECHPACK_WLAN.LA.2.0.R3.00.00.00.000.037 platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:AU_TECHPACK_WLAN.LA.2.0.R3.00.00.00.000.037 platform/vendor/qcom-opensource/wlan/qcacld-3.0:AU_TECHPACK_WLAN.LA.2.0.R3.00.00.00.000.037 platform/vendor/qcom-opensource/wlan/utils/sigma-dut:AU_TECHPACK_WLAN.LA.2.0.R3.00.00.00.000.037 platform/vendor/qcom-opensource/wlan/wlan-devicetree:AU_TECHPACK_WLAN.LA.2.0.R3.00.00.00.000.037 platform/vendor/qcom-proprietary/display-devicetree:AU_TECHPACK_DISPLAY.LA.6.0.R1.00.00.00.000.071 platform/vendor/qcom/opensource/audio-devicetree:AU_TECHPACK_AUDIO_HANDSET.LA.11.0.R1.00.00.00.000.046 platform/vendor/qcom/opensource/audio-kernel-ar:AU_TECHPACK_AUDIO_HANDSET.LA.11.0.R1.00.00.00.000.046 platform/vendor/qcom/opensource/datarmnet:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078 platform/vendor/qcom/opensource/datarmnet-ext:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.097 platform/vendor/qcom/opensource/dsp-devicetree:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.089 platform/vendor/qcom/opensource/dsp-kernel:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078 platform/vendor/qcom/opensource/graphics-devicetree:AU_TECHPACK_GRAPHICS.LA.16.0.R1.00.00.00.000.038 platform/vendor/qcom/opensource/graphics-kernel:AU_TECHPACK_GRAPHICS.LA.16.0.R1.00.00.00.000.038 platform/vendor/qcom/opensource/securemsm-kernel:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078 platform/vendor/qcom/opensource/spu-kernel:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.102 platform/vendor/st/opensource/driver:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.089 platform/vendor/st/opensource/eSE-driver:AU_LINUX_ANDROID_LA.VENDOR.16.2.0.R1.11.00.00.1277.078
1 parent bb2896e commit c368834

272 files changed

Lines changed: 38332 additions & 12062 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/canoe_overlay_common.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@
6565
oplus-ocp-device;
6666
};
6767
//#endif /* CONFIG_OPLUS_FEATURE_QCOM_PMICWD */
68-
};
68+
};

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

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

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#define OPLUS_CHG_IC_VIRTUAL_BATT_BAL 27
3232
#define OPLUS_CHG_IC_LEVEL_SHIFT 28
3333
#define OPLUS_CHG_IC_VIRTUAL_LEVEL_SHIFT 29
34+
#define OPLUS_CHG_IC_VIRTUAL_BOOST 30
3435

3536
#define OPLUS_CHG_IC_CONNECT_PARALLEL 0
3637
#define OPLUS_CHG_IC_CONNECT_SERIAL 1
@@ -188,6 +189,7 @@
188189
#define OPLUS_IC_FUNC_CP_SET_UCP_DISABLE (OPLUS_IC_FUNC_NUM_CP_START + 16)
189190
#define OPLUS_IC_FUNC_CP_GET_IIN_MAX (OPLUS_IC_FUNC_NUM_CP_START + 17)
190191
#define OPLUS_IC_FUNC_CP_WATCHDOG_RESET (OPLUS_IC_FUNC_NUM_CP_START + 18)
192+
#define OPLUS_IC_FUNC_CP_SET_SSTIMEOUT_UCP_ENABLE (OPLUS_IC_FUNC_NUM_CP_START + 19)
191193

192194
/* gauge */
193195
#define OPLUS_IC_FUNC_NUM_GAUGE_START 400
@@ -301,6 +303,7 @@
301303
#define OPLUS_IC_FUNC_GAUGE_GET_FCL_VOLT (OPLUS_IC_FUNC_NUM_GAUGE2_START + 6)
302304
#define OPLUS_IC_FUNC_GAUGE_GET_BATT_SOC_CENTI (OPLUS_IC_FUNC_NUM_GAUGE2_START + 7)
303305
#define OPLUS_IC_FUNC_GAUGE_SET_TRUE_FCC (OPLUS_IC_FUNC_NUM_GAUGE2_START + 8)
306+
#define OPLUS_IC_FUNC_GAUGE_GET_SN_MATCH (OPLUS_IC_FUNC_NUM_GAUGE2_START + 9)
304307

305308
/* misc */
306309
#define OPLUS_IC_FUNC_NUM_MISC_START 500
@@ -372,6 +375,14 @@
372375
#define OPLUS_IC_FUNC_UFCS_IS_VOL_ACC_TEST_MODE (OPLUS_IC_FUNC_NUM_UFCS_START + 15)
373376
#define OPLUS_IC_FUNC_UFCS_SET_SM_PERIOD (OPLUS_IC_FUNC_NUM_UFCS_START + 16)
374377

378+
/* boost */
379+
#define OPLUS_IC_FUNC_NUM_BOOST_START 1400
380+
#define OPLUS_IC_FUNC_BOOST_SET_CV (OPLUS_IC_FUNC_NUM_BOOST_START + 0)
381+
#define OPLUS_IC_FUNC_BOOST_ENABLE_OTG_MODE (OPLUS_IC_FUNC_NUM_BOOST_START + 1)
382+
#define OPLUS_IC_FUNC_BOOST_SET_WORK_MODE (OPLUS_IC_FUNC_NUM_BOOST_START + 2)
383+
#define OPLUS_IC_FUNC_BOOST_SET_BCL_RATE (OPLUS_IC_FUNC_NUM_BOOST_START + 3)
384+
#define OPLUS_IC_FUNC_BOOST_SET_BCL_VOL (OPLUS_IC_FUNC_NUM_BOOST_START + 4)
385+
375386
#define VOOC_VERSION_DEFAULT 0x0
376387
#define VOOC_VERSION_1_0 0x1
377388
#define VOOC_VERSION_2_0 0x2
@@ -561,4 +572,6 @@
561572
/* track version */
562573
#define TRACK_VER_3_4 0
563574
#define TRACK_VER_4_0 1
575+
576+
#define SN_MATCH_REGION 0
564577
//endif OPLUS_FEATURE_CHG_BASIC

‎kernel_platform/qcom/opensource/devicetree/oplus/oplus_nfc/swangoose_nfc.dtsi‎

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

‎kernel_platform/qcom/opensource/devicetree/oplus/tp/infiniti-oplus-tp-24831.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@
321321
bus,spi-mode = <0>;
322322
bus,rx-dummy = <0>;
323323
bus,tx-dummy = <0>;
324-
spi-cs-setup-support;
325324
spi-cs-setup = <50 0>;
326325
};
327326
};

‎kernel_platform/qcom/opensource/devicetree/qcom/canoe-thermal-overlay.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
socd_trip: socd-trip {
3232
/* #ifdef OPLUS_FEATURE_CHG_BASIC */
33-
/* thershold: 3% power */
33+
/* thershold: 5% power */
3434
temperature = <95>;
3535
/* #else */
3636
/* temperature = <90>; */

‎vendor/oplus/kernel/audio/codecs/tfa98xx-v6/tfa9865_tfafieldnames.h‎

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

‎vendor/oplus/kernel/audio/codecs/tfa98xx-v6/tfa9865_tfafieldnames_A2.h‎

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

vendor/oplus/kernel/audio/codecs/tfa98xx-v6/tfa986xn2_tfafieldnames.h renamed to vendor/oplus/kernel/audio/codecs/tfa98xx-v6/tfa986x_tfafieldnames_N2.h

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

‎vendor/oplus/kernel/audio/codecs/tfa98xx-v6/tfa98xx_tfafieldnames.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ typedef struct TfaIrqName {
3232
#include "tfa9874_tfafieldnames.h"
3333
#include "tfa9894_tfafieldnames.h"
3434
#include "tfa9894_tfafieldnames_N2.h"
35-
#include "tfa9865_tfafieldnames.h"
36-
#include "tfa986x_tfafieldnames.h"
37-
#include "tfa9865_tfafieldnames_A2.h"
38-
#include "tfa986xn2_tfafieldnames.h"
3935

4036
/*To support tfa9873*/
4137
#include "tfa9873_tfafieldnames.h"
4238
#include "tfa9873_tfafieldnames_B0.h"
39+
#include "tfa986x_tfafieldnames.h"
40+
#include "tfa986x_tfafieldnames_N2.h"
4341

4442
/* missing 'common' defs break the build but unused in TFA1 context */
4543
#define TFA1_BF_AMPINSEL -1

0 commit comments

Comments
 (0)