From 0f0d4abbb48151b678209a8ffcdc10d585cad041 Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Fri, 6 Oct 2023 05:52:34 -0400
Subject: [PATCH] berlin: T1RGS33M.135-109-9-1

Change-Id: If67b0702a1ce10c3d51949fdbec19ca2b707f557
---
 BoardConfig.mk                       |   2 +-
 audio/audio_policy_configuration.xml |  78 ++++++++++++---
 audio/sku_yupik/mixer_paths.xml      |  48 +++------
 lineage_berlin.mk                    |   4 +-
 modules.load                         | 143 ++++++++++++++-------------
 proprietary-files.txt                |  14 +--
 6 files changed, 158 insertions(+), 131 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a9ebc40..aca782b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -56,7 +56,7 @@ TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 90
 
 # Security
-VENDOR_SECURITY_PATCH := 2023-06-01
+VENDOR_SECURITY_PATCH := 2023-09-01
 
 # inherit from the proprietary version
 include vendor/motorola/berlin/BoardConfigVendor.mk
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index df952e1..b9ebe93 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -50,6 +50,21 @@
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="hifi_playback" role="source" />
+                <mixPort name="direct_pcm" role="source"
+                        flags="AUDIO_OUTPUT_FLAG_DIRECT">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                  <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                </mixPort>
                 <mixPort name="compressed_offload" role="source"
                          flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
                     <profile name="" format="AUDIO_FORMAT_MP3"
@@ -132,6 +147,15 @@
                 </devicePort>
                 <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
                 </devicePort>
+                <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
+                encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE">
+                </devicePort>
+                <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
+                encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE">
+                </devicePort>
+                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
+                encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE">
+                </devicePort>
                 <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">
                 </devicePort>
                 <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
@@ -162,35 +186,41 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Wired Headset"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Wired Headphones"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Line Out"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="Dock Headset"
                        sources="primary output,deep_buffer,voip_rx"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep_buffer,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,voip_rx"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep_buffer,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,voip_rx"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep_buffer,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,voip_rx"/>
+                <route type="mix" sink="BT A2DP Out"
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+                <route type="mix" sink="BT A2DP Headphones"
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+                <route type="mix" sink="BT A2DP Speaker"
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="HDMI Out"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep_buffer,compressed_offload,hifi_playback,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,hifi_playback,voip_rx"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep_buffer,compressed_offload,hifi_playback,voip_rx"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,hifi_playback,voip_rx"/>
                 <route type="mix" sink="Telephony Tx"
                        sources="voice_tx,incall_music_uplink"/>
                 <route type="mix" sink="voice_rx"
                        sources="Telephony Rx"/>
                 <route type="mix" sink="Proxy"
-                       sources="primary output,deep_buffer,compressed_offload"/>
+                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>
                 <route type="mix" sink="voip_tx"
                        sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
                 <route type="mix" sink="primary input"
@@ -204,7 +234,26 @@
         </module>
 
         <!-- A2dp Audio HAL -->
-        <xi:include href="a2dp_in_audio_policy_configuration.xml"/>
+        <module name="a2dp" halVersion="2.0">
+            <mixPorts>
+                <mixPort name="a2dp input" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
+            </mixPorts>
+
+            <devicePorts>
+                <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </devicePort>
+            </devicePorts>
+
+            <routes>
+                <route type="mix" sink="a2dp input"
+                       sources="BT A2DP In"/>
+            </routes>
+        </module>
 
         <!-- Usb Audio HAL -->
         <xi:include href="usb_audio_policy_configuration.xml"/>
@@ -212,9 +261,6 @@
         <!-- Remote Submix Audio HAL -->
         <xi:include href="r_submix_audio_policy_configuration.xml"/>
 
-        <!-- Bluetooth Audio HAL -->
-        <xi:include href="bluetooth_audio_policy_configuration.xml"/>
-
     </modules>
     <!-- End of Modules section -->
 
diff --git a/audio/sku_yupik/mixer_paths.xml b/audio/sku_yupik/mixer_paths.xml
index 735c770..5db9c59 100644
--- a/audio/sku_yupik/mixer_paths.xml
+++ b/audio/sku_yupik/mixer_paths.xml
@@ -26,15 +26,6 @@
 <!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
 <mixer>
     <!-- These are the initial mixer settings -->
-    <ctl name="Voice Rx Device Mute" id="0" value="0" />
-    <ctl name="Voice Rx Device Mute" id="1" value="-1" />
-    <ctl name="Voice Rx Device Mute" id="2" value="20" />
-    <ctl name="Voice Tx Mute" id="0" value="0" />
-    <ctl name="Voice Tx Mute" id="1" value="-1" />
-    <ctl name="Voice Tx Mute" id="2" value="500" />
-    <ctl name="Voice Rx Gain" id="0" value="0" />
-    <ctl name="Voice Rx Gain" id="1" value="-1" />
-    <ctl name="Voice Rx Gain" id="2" value="20" />
     <ctl name="Voice Sidetone Enable" value="0" />
     <ctl name="Voip Tx Mute" id="0" value="0" />
     <ctl name="Voip Tx Mute" id="1" value="500" />
@@ -46,9 +37,6 @@
     <ctl name="Voip Evrc Min Max Rate Config" id="1" value="4" />
     <ctl name="Voip Dtx Mode" value="0" />
     <ctl name="TTY Mode" value="OFF" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia5" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia7" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia8" value="0" />
     <ctl name="SLIMBUS_7_RX Audio Mixer MultiMedia10" value="0" />
@@ -62,8 +50,6 @@
     <ctl name="MultiMedia5 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_4" value="0" />
-    <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
-    <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
     <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_3" value="0" />
     <ctl name="MultiMedia10 Mixer TX_CDC_DMA_TX_4" value="0" />
     <ctl name="MultiMedia10 Mixer SLIM_7_TX" value="0" />
@@ -151,9 +137,8 @@
     <ctl name="MultiMedia8 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia10 Mixer USB_AUDIO_TX" value="0" />
     <ctl name="MultiMedia17 Mixer USB_AUDIO_TX" value="0" />
-    <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
-    <ctl name="RX_CDC_DMA_RX_1 Channels" value="One" />
-    <ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
+    <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_3" value="0" />
+    <ctl name="MultiMedia2 Mixer TX_CDC_DMA_TX_4" value="0" />
     <ctl name="VI_FEED_TX Channels" value="Two" />
     <ctl name="RX_CDC_DMA_RX_0 Format" value="S16_LE" />
     <ctl name="RX_CDC_DMA_RX_1 Format" value="S16_LE" />
@@ -170,8 +155,11 @@
     <!-- usb headset -->
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
+    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
+    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="0" />
+    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="0" />
@@ -180,7 +168,6 @@
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="0" />
     <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="0" />
     <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
     <!-- usb headset end -->
     <!-- fm -->
     <ctl name="SLIMBUS_8 LOOPBACK Volume" value="0" />
@@ -253,6 +240,7 @@
     <!-- Incall Music -->
     <ctl name="Incall_Music Audio Mixer MultiMedia2" value="0" />
     <ctl name="Incall_Music Audio Mixer MultiMedia9" value="0" />
+    <ctl name="Incall_Music_2 Audio Mixer MultiMedia9" value="0" />
     <!-- Incall Music End -->
 
     <!-- compress-voip-call start -->
@@ -276,6 +264,7 @@
     <ctl name="MultiMedia1 Mixer SLIM_7_TX" value="0" />
     <!-- audio record compress-->
     <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_3" value="0" />
+    <ctl name="MultiMedia8 Mixer TX_CDC_DMA_TX_4" value="0" />
     <ctl name="MultiMedia8 Mixer SLIM_7_TX" value="0" />
     <ctl name="MultiMedia8 Mixer AFE_PCM_TX" value="0" />
     <!-- audio record compress end-->
@@ -286,26 +275,20 @@
     <ctl name="SLIM7_RX ADM Channels" value="Zero" />
     <!-- split a2dp end-->
 
-    <!-- ADSP testfwk -->
-    <ctl name="RX_CDC_DMA_RX_1_DL_HL Switch" value="0" />
-    <ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="0" />
-    <!-- ADSP testfwk end-->
-
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
-
     <!-- Codec controls -->
 
     <!-- RX Controls -->
     <ctl name="RX_MACRO RX0 MUX" value="ZERO" />
     <ctl name="RX_MACRO RX1 MUX" value="ZERO" />
     <ctl name="RX_CDC_DMA_RX_0 Channels" value="One" />
+    <ctl name="RX_CDC_DMA_RX_1 Channels" value="One" />
+    <ctl name="RX INT0 MIX2 INP" value="ZERO" />
     <ctl name="RX INT0_1 MIX1 INP0" value="ZERO" />
     <ctl name="RX INT0_1 MIX1 INP1" value="ZERO" />
     <ctl name="RX INT0_1 MIX1 INP2" value="ZERO" />
     <ctl name="RX INT1_1 MIX1 INP0" value="ZERO" />
     <ctl name="RX INT1_1 MIX1 INP1" value="ZERO" />
     <ctl name="RX INT1_1 MIX1 INP2" value="ZERO" />
-    <ctl name="RX_CDC_DMA_RX_0 Audio Mixer MultiMedia1" value="0" />
     <ctl name="RX INT0 DEM MUX" value="NORMAL_DSM_OUT" />
     <ctl name="RX INT1 DEM MUX" value="NORMAL_DSM_OUT" />
     <ctl name="RX_COMP1 Switch" value="0" />
@@ -328,7 +311,7 @@
     <ctl name="ADC3_MIXER Switch" value="0" />
 
     <ctl name="TX_CDC_DMA_TX_3 Channels" value="One" />
-    <ctl name="MultiMedia1 Mixer TX_CDC_DMA_TX_3" value="0" />
+    <ctl name="TX_CDC_DMA_TX_4 Channels" value="One"/>
     <ctl name="ADC2 MUX" value="INP2" />
     <ctl name="DEC0_BCS Switch" value="0" />
     <ctl name="TX LPI Enable" value="0" />
@@ -341,7 +324,6 @@
     <ctl name="TX_AIF1_CAP Mixer DEC6" value="0" />
     <ctl name="TX_AIF1_CAP Mixer DEC7" value="0" />
     <ctl name="TX_AIF2_CAP Mixer DEC0" value="0" />
-    <ctl name="TX_AIF2_CAP Mixer DEC0" value="0" />
     <ctl name="TX_AIF2_CAP Mixer DEC1" value="0" />
     <ctl name="TX_AIF2_CAP Mixer DEC2" value="0" />
     <ctl name="TX_AIF2_CAP Mixer DEC3" value="0" />
@@ -435,7 +417,7 @@
     <ctl name="IIR0 Enable Band3" value="0" />
     <ctl name="IIR0 Enable Band4" value="0" />
     <ctl name="IIR0 Enable Band5" value="0" />
-    <ctl name="IIR0 INP0 Volume" value="54" />
+    <ctl name="IIR0 INP0 Volume" value="40" />
     <ctl name="IIR0 INP0 MUX" value="ZERO" />
     <ctl name="IIR0 INP1 MUX" value="ZERO" />
     <ctl name="IIR0 INP2 MUX" value="ZERO" />
@@ -464,6 +446,7 @@
     <ctl name="MultiMedia16 Mixer TX_CDC_DMA_TX_4" value="0" />
     <ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="0" />
 
+    <ctl name="RX_CDC_DMA_RX_5 Audio Mixer MultiMedia4" value="0" />
     <ctl name="RX_CDC_DMA_RX_6 Audio Mixer MultiMedia32" value="0"/>
     <ctl name="RX_CDC_DMA_RX_6 Channels" value="One" />
 
@@ -1130,7 +1113,7 @@
         <path name="hfp-sco headphones" />
     </path>
 
-    <path name="compress-voip-call">
+    <path name="compress-voip-call speaker">
         <ctl name="SEN_MI2S_RX_Voice Mixer Voip" value="1" />
         <ctl name="Voip_Tx Mixer TX_CDC_DMA_TX_3_Voip" value="1" />
     </path>
@@ -1841,8 +1824,8 @@
 
     <path name="sidetone-handset">
         <path name="sidetone-iir" />
-        <ctl name="IIR0 INP0 Volume" value="54" />
-        <ctl name="IIR0 INP0 MUX" value="DEC2" />
+        <ctl name="IIR0 INP0 Volume" value="40" />
+        <ctl name="IIR0 INP0 MUX" value="DEC1" />
         <ctl name="RX INT0 MIX2 INP" value="SRC0" />
     </path>
 
@@ -2054,7 +2037,6 @@
 
     <path name="dmic-endfire">
         <path name="handset-dmic-endfire" />
-        <ctl name="IIR0 INP0 MUX" value="DEC2" />
     </path>
 
     <path name="handset-stereo-dmic-ef">
diff --git a/lineage_berlin.mk b/lineage_berlin.mk
index c4597c0..1bdf161 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 12 S1RGS32.53-18-22-33 c29562-b008c release-keys"
+    PRIVATE_BUILD_DESC="berlin_global-user 13 T1RGS33M.135-109-9-1 cd9ba-7b59ee release-keys"
 
-BUILD_FINGERPRINT := motorola/berlin_global/berlin:12/S1RGS32.53-18-22-33/c29562-b008c:user/release-keys
+BUILD_FINGERPRINT := motorola/berlin_global/berlin:13/T1RGS33M.135-109-9-1/cd9ba-7b59ee:user/release-keys
diff --git a/modules.load b/modules.load
index a39340b..d1035c1 100644
--- a/modules.load
+++ b/modules.load
@@ -1,81 +1,86 @@
-stub_dlkm.ko
-machine_dlkm.ko
 fc2580.ko
+wcd937x_dlkm.ko
+mt20xx.ko
+pinctrl_wcd_dlkm.ko
 mt2063.ko
+snd_event_dlkm.ko
+tuner-xc2028.ko
+wcd938x_slave_dlkm.ko
+wcd_core_dlkm.ko
+llcc_perfmon.ko
+fc0012.ko
+fc0013.ko
+qcom_edac.ko
+qm1d1b0004.ko
+it913x.ko
+mt2060.ko
+si2157.ko
+rx_macro_dlkm.ko
+slimbus-ngd.ko
+tuner-simple.ko
+xc4000.ko
+mxl5007t.ko
+tx_macro_dlkm.ko
+adsp_loader_dlkm.ko
+msm_drm.ko
+qt1010.ko
+aw882xx_k504.ko
+max2165.ko
+wcd9xxx_dlkm.ko
+pinctrl_lpi_dlkm.ko
+m88rs6000t.ko
+mt2266.ko
+e4000.ko
+mxl5005s.ko
+camera.ko
+qm1d1c0042.ko
+bolero_cdc_dlkm.ko
+r820t.ko
+tua9001.ko
+swr_haptics_dlkm.ko
+bt_fm_slim.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
+stub_dlkm.ko
+mt2131.ko
 swr_ctrl_dlkm.ko
-mxl301rf.ko
+tda18250.ko
+slimbus.ko
+hdmi_dlkm.ko
+wsa_macro_dlkm.ko
+hid-aksys.ko
+tuner-types.ko
+native_dlkm.ko
 swr_dlkm.ko
-rdbg.ko
+xc5000.ko
+mxl301rf.ko
+machine_dlkm.ko
+tea5767.ko
 swr_dmic_dlkm.ko
-r820t.ko
-camera.ko
-tx_macro_dlkm.ko
-wlan.ko
+va_macro_dlkm.ko
+mc44s803.ko
+tda18218.ko
+platform_dlkm.ko
+q6_dlkm.ko
+tea5761.ko
+wsa883x_dlkm.ko
+radio-i2c-rtc6226-qca.ko
+wcd938x_dlkm.ko
+wcd937x_slave_dlkm.ko
+btpower.ko
+fc0011.ko
+mbhc_dlkm.ko
+q6_notifier_dlkm.ko
+rdbg.ko
+tda18212.ko
+qca_cld3_wlan.ko
+qca_cld3_qca6750.ko
+qca_cld3_qca6390.ko
+qca_cld3_wlan.ko
+qca_cld3_qca6750.ko
+qca_cld3_qca6390.ko
 rmnet_core.ko
 rmnet_ctl.ko
 rmnet_offload.ko
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 32e1afa..39a91b1 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs below are extracted from berlin_global-user 12 S1RGS32.53-18-22-33 c29562-b008c release-keys.
+# All unpinned blobs below are extracted from berlin_global-user 13 T1RGS33M.135-109-9-1 cd9ba-7b59ee release-keys.
 
 # ACDB Data
 vendor/etc/acdbdata/nn_ns_models/candidate__2.7.1.31__3.0.0__eai_1.10_enpu1.pmd
@@ -435,8 +435,8 @@ vendor/lib64/libgoodixhwfingerprint.so
 vendor/lib64/vendor.goodix.hardware.biometrics.fingerprint@3.0.so
 
 # HotwordEnrollment
--product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk
--product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk
+-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk
+-product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
 system_ext/framework/com.android.hotwordenrollment.common.util.jar
 
@@ -446,7 +446,7 @@ product/etc/permissions/com.motorola.camera3.xml
 product/etc/permissions/deviceowner-configuration-com.motorola.camera3.xml
 product/etc/permissions/privapp-permissions-com.motorola.camera3.xml
 product/etc/sysconfig/hiddenapi-whitelist-com.motorola.camera3.xml
-product/priv-app/MotCamera3/MotCamera3.apk;OVERRIDES=Aperture;PRESIGNED
+product/priv-app/MotCamera4/MotCamera4.apk;OVERRIDES=Aperture;PRESIGNED
 -system/app/MotoSignatureApp/MotoSignatureApp.apk;PRESIGNED
 system/etc/permissions/com.motorola.motosignature.xml
 system/etc/permissions/moto-core_services.xml
@@ -455,11 +455,6 @@ system/framework/com.motorola.motosignature.jar
 system/framework/moto-core_services.jar
 system/framework/moto-settings.jar
 system_ext/bin/motsettings
-system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml
-system_ext/etc/public.libraries-motocamera.txt
-system_ext/framework/com.motorola.androidx.camera.extensions.jar
-system_ext/lib/libmcf_native_window_helper.motocamera.so
-system_ext/lib64/libmcf_native_window_helper.motocamera.so
 -system_ext/priv-app/MotorolaSettingsProvider/MotorolaSettingsProvider.apk
 
 # Moto Permissions
@@ -470,7 +465,6 @@ product/etc/permissions/com.motorola.camera3.xml:vendor/etc/permissions/com.moto
 product/etc/permissions/com.motorola.moto-uirefresh.xml
 product/etc/permissions/com.motorola.motodisplay.xml
 product/etc/permissions/privapp-permissions-com.motorola.motodisplay.xml
-system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml:vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml
 
 # NFC
 vendor/bin/STFlashTool