From 58853b9281293aced2c41c79343b9dfe1d0a3e31 Mon Sep 17 00:00:00 2001
From: SGCMarkus <markusornik@gmail.com>
Date: Sat, 6 Aug 2022 21:50:46 +0200
Subject: [PATCH] berlin: update to S1RG32.53-18-11

Change-Id: I7c3fe69ad28cad7e1f9a954541cbb9e9eba7bfc5
---
 BoardConfig.mk                          |   2 +-
 audio/sku_yupik/audio_platform_info.xml |  15 ++-
 lineage_berlin.mk                       |   4 +-
 media/media_profiles_yupik_v0.xml       |  13 ---
 media/media_profiles_yupik_v1.xml       |  13 ---
 modules.blocklist                       |   3 +-
 modules.load                            | 144 ++++++++++++------------
 proprietary-files.txt                   |   5 +
 8 files changed, 96 insertions(+), 103 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 224b84c..26cdeb8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -59,7 +59,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
 
 # Security
-VENDOR_SECURITY_PATCH := 2021-12-01
+VENDOR_SECURITY_PATCH := 2022-03-01
 
 # inherit from the proprietary version
 -include vendor/motorola/berlin/BoardConfigVendor.mk
diff --git a/audio/sku_yupik/audio_platform_info.xml b/audio/sku_yupik/audio_platform_info.xml
index aafe4a4..a39a1c2 100644
--- a/audio/sku_yupik/audio_platform_info.xml
+++ b/audio/sku_yupik/audio_platform_info.xml
@@ -118,7 +118,20 @@
         <gain_level_map db="-10.2" level="2"/>
         <gain_level_map db="0" level="1"/>
     </gain_db_to_level_mapping>
-
+    <crystalk_devices>
+        <device name="SND_DEVICE_IN_HANDSET_MIC_NN" value="true" />
+        <device name="SND_DEVICE_IN_HANDSET_MIC" value="false" />
+        <device name="SND_DEVICE_IN_VOICE_REC_EXTERNAL_MIC_NN" value="true" />
+        <device name="SND_DEVICE_IN_VOICE_REC_EXTERNAL_MIC" value="false" />
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_GAME_NN" value="true" />
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_GAME" value="false" />
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN" value="true" />
+        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" value="false" />
+        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE_NN" value="true" />
+        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" value="false" />
+        <device name="SND_DEVICE_IN_USB_HEADSET_MIC_AEC_NN" value="true" />
+        <device name="SND_DEVICE_IN_USB_HEADSET_MIC_AEC" value="false" />
+    </crystalk_devices>
     <acdb_ids>
 	<!-- Output devices -->
 	<device name="SND_DEVICE_OUT_HANDSET" acdb_id="7" />
diff --git a/lineage_berlin.mk b/lineage_berlin.mk
index 46c23e8..c413471 100644
--- a/lineage_berlin.mk
+++ b/lineage_berlin.mk
@@ -34,6 +34,6 @@ PRODUCT_GMS_CLIENTID_BASE := android-motorola
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
     TARGET_PRODUCT=berlin_retail \
-    PRIVATE_BUILD_DESC="berlin_global-user 11 RRG31.Q3-23-85 9bd48 release-keys"
+    PRIVATE_BUILD_DESC="berlin_global-user 11 S1RG32.53-18-11 8ab7b release-keys"
 
-BUILD_FINGERPRINT := motorola/berlin_global/berlin:11/RRG31.Q3-23-85/9bd48:user/release-keys
+BUILD_FINGERPRINT := motorola/berlin_global/berlin:11/S1RG32.53-18-11/8ab7b:user/release-keys
diff --git a/media/media_profiles_yupik_v0.xml b/media/media_profiles_yupik_v0.xml
index e12adfb..35dd969 100644
--- a/media/media_profiles_yupik_v0.xml
+++ b/media/media_profiles_yupik_v0.xml
@@ -192,19 +192,6 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-            bitRate="57500000"
-            width="4096"
-            height="2160"
-            frameRate="30" />
-
-      <Audio codec="aac"
-            bitRate="156000"
-            sampleRate="48000"
-            channels="2" />
-    </EncoderProfile>
-
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="50000000"
diff --git a/media/media_profiles_yupik_v1.xml b/media/media_profiles_yupik_v1.xml
index e12adfb..35dd969 100644
--- a/media/media_profiles_yupik_v1.xml
+++ b/media/media_profiles_yupik_v1.xml
@@ -192,19 +192,6 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-            bitRate="57500000"
-            width="4096"
-            height="2160"
-            frameRate="30" />
-
-      <Audio codec="aac"
-            bitRate="156000"
-            sampleRate="48000"
-            channels="2" />
-    </EncoderProfile>
-
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="50000000"
diff --git a/modules.blocklist b/modules.blocklist
index c0ac315..a484c55 100644
--- a/modules.blocklist
+++ b/modules.blocklist
@@ -99,4 +99,5 @@ blocklist utags
 #
 # Motorola product module block list
 #
-
+blocklist camera
+blocklist aw8695
diff --git a/modules.load b/modules.load
index 160368b..5b299e5 100644
--- a/modules.load
+++ b/modules.load
@@ -1,80 +1,80 @@
-xc5000.ko
+stub_dlkm.ko
+machine_dlkm.ko
+fc2580.ko
 mt2063.ko
-adsp_loader_dlkm.ko
-mxl5007t.ko
-bt_fm_slim.ko
-snd_event_dlkm.ko
-camera.ko
-aw882xx_k504.ko
-fc0013.ko
-radio-i2c-rtc6226-qca.ko
-wcd937x_dlkm.ko
-fc0011.ko
-tea5767.ko
-wcd938x_dlkm.ko
-mt2060.ko
-pinctrl_lpi_dlkm.ko
-wsa883x_dlkm.ko
-wcd9xxx_dlkm.ko
-rx_macro_dlkm.ko
-wcd937x_slave_dlkm.ko
-mt2131.ko
-native_dlkm.ko
-q6_pdr_dlkm.ko
-wsa_macro_dlkm.ko
-tuner-types.ko
-tx_macro_dlkm.ko
-swr_dlkm.ko
-btpower.ko
-swr_haptics_dlkm.ko
-slimbus-ngd.ko
-qt1010.ko
-mc44s803.ko
-msi001.ko
-mt2266.ko
-platform_dlkm.ko
-tua9001.ko
-slimbus.ko
-wcd938x_slave_dlkm.ko
+tda9887.ko
+apr_dlkm.ko
+mxl5005s.ko
 xc4000.ko
+tuner-xc2028.ko
+radio-i2c-rtc6226-qca.ko
+max2165.ko
+qt1010.ko
+slimbus-ngd.ko
+llcc_perfmon.ko
+platform_dlkm.ko
+wsa883x_dlkm.ko
+tea5767.ko
+msi001.ko
+qm1d1c0042.ko
+fc0013.ko
+btpower.ko
+tua9001.ko
+m88rs6000t.ko
+qcom_edac.ko
+fc0011.ko
+wcd937x_dlkm.ko
+pinctrl_lpi_dlkm.ko
+fc0012.ko
+aw882xx_k504.ko
+mt20xx.ko
+xc5000.ko
+wcd9xxx_dlkm.ko
+bt_fm_slim.ko
+tea5761.ko
+rx_macro_dlkm.ko
+pinctrl_wcd_dlkm.ko
+wsa_macro_dlkm.ko
+adsp_loader_dlkm.ko
+wcd938x_dlkm.ko
+q6_dlkm.ko
+hdmi_dlkm.ko
+swr_haptics_dlkm.ko
+tda18218.ko
+msm_drm.ko
+tda18212.ko
+wcd937x_slave_dlkm.ko
+mt2060.ko
+q6_notifier_dlkm.ko
+tuner-simple.ko
+snd_event_dlkm.ko
+mc44s803.ko
+wcd_core_dlkm.ko
+qm1d1b0004.ko
+tda18250.ko
+mbhc_dlkm.ko
+tuner-types.ko
+si2157.ko
+mt2131.ko
+slimbus.ko
+native_dlkm.ko
+va_macro_dlkm.ko
+hid-aksys.ko
+mt2266.ko
+bolero_cdc_dlkm.ko
+mxl5007t.ko
+wcd938x_slave_dlkm.ko
+q6_pdr_dlkm.ko
+e4000.ko
+it913x.ko
+swr_ctrl_dlkm.ko
+mxl301rf.ko
+swr_dlkm.ko
 rdbg.ko
 swr_dmic_dlkm.ko
-wcd_core_dlkm.ko
-max2165.ko
-hid-aksys.ko
-msm_drm.ko
-bolero_cdc_dlkm.ko
-apr_dlkm.ko
-machine_dlkm.ko
-mbhc_dlkm.ko
-q6_dlkm.ko
-mxl5005s.ko
-tea5761.ko
-q6_notifier_dlkm.ko
-tuner-xc2028.ko
-tda18212.ko
-tda18218.ko
-qm1d1b0004.ko
-tuner-simple.ko
-e4000.ko
-swr_ctrl_dlkm.ko
-fc0012.ko
-si2157.ko
-tda18250.ko
-fc2580.ko
-m88rs6000t.ko
-qm1d1c0042.ko
-hdmi_dlkm.ko
-it913x.ko
-qcom_edac.ko
-pinctrl_wcd_dlkm.ko
-llcc_perfmon.ko
 r820t.ko
-stub_dlkm.ko
-mxl301rf.ko
-mt20xx.ko
-tda9887.ko
-va_macro_dlkm.ko
+camera.ko
+tx_macro_dlkm.ko
 qca_cld3_wlan.ko
 qca_cld3_qca6750.ko
 qca_cld3_qca6390.ko
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 3b5354c..22b26db 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -409,6 +409,9 @@ vendor/lib64/camera/com.qti.tuned.mot_berlin_s5khm2.bin
 # Display calibration data
 vendor/etc/qdcm_calib_data_mipi_mot_cmd_csot_1080p_dsc_667.xml
 vendor/etc/qdcm_calib_data_mipi_mot_cmd_visionox_1080p_dsc_667.xml
+vendor/etc/qdcm_calib_data_nt36672e_60_Hz_fhd_plus_video_mode_panel_without_DSC.xml
+vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_120Hz_Video_panel.xml
+vendor/etc/qdcm_calib_data_nt36672e_fhd_plus_144Hz_video_panel.xml
 
 # Fingerprint
 vendor/lib64/hw/fingerprint.goodix.default.so
@@ -433,6 +436,7 @@ vendor/etc/st21nfc_conf_ss.txt
 
 # NFC firmware
 vendor/firmware/st21nfc_fw.bin
+vendor/firmware/st21nfc_fw7.bin
 
 # OEM
 vendor/etc/vhw.xml
@@ -503,6 +507,7 @@ vendor/etc/sensors/proto/mot_offbody.proto
 vendor/etc/sensors/proto/mot_probe.proto
 vendor/etc/sensors/proto/mot_proxcal.proto
 vendor/etc/sensors/proto/mot_stowed.proto
+vendor/etc/sensors/proto/mot_tap.proto
 vendor/etc/sensors/proto/mot_vsync.proto
 vendor/etc/sensors/proto/nanopb.proto
 vendor/etc/sensors/proto/sns_accel.proto