diff --git a/audio/tangorpro/config/audio_platform_configuration.xml b/audio/tangorpro/config/audio_platform_configuration.xml
index c15d6d8..d6df79a 100644
--- a/audio/tangorpro/config/audio_platform_configuration.xml
+++ b/audio/tangorpro/config/audio_platform_configuration.xml
@@ -35,7 +35,7 @@
         <intf id="BE_HW_RX_INTF_5" name="USB_DOCK_RX" min_bit="24" min_chan="1" min_rate="48000" block_id="20"/>
         <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
         <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_0" block_id="134,128"/>
+        <intf id="BE_HW_TX_INTF_0" block_id="134,128,137"/>
     </hw_intf>
 
     <product_lists>
@@ -205,6 +205,7 @@
         <!-- for hifi -->
         <usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
         <usecase id="UC_HIFI_RECORD" dev1="26"/>
+        <usecase id="UC_ULTRASOUND_RECORD" dev1="12" period="10" period_num="3"/>
     </usecase_attr>
 
     <dsp_latency>
@@ -289,7 +290,7 @@
     <external_module>
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4"/>
         <module libname="audio_spk_35l41.so" argu="SpeakerNum=4"/>
-        <module libname="audio_fortemedia_aoc.so" argu="Legacy_VoIP=y"/>
+        <module libname="audio_fortemedia_aoc.so" argu="RTN_SUP=y Legacy_VoIP=y DOCK_CHARGER_MONITOR=y"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml
index 3418fc2..a8f55b8 100644
--- a/audio/tangorpro/config/audio_policy_configuration.xml
+++ b/audio/tangorpro/config/audio_policy_configuration.xml
@@ -18,7 +18,6 @@
             <attachedDevices>
                 <item>Speaker</item>
                 <item>Speaker Safe</item>
-                <item>Earpiece</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
@@ -79,6 +78,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="ultrasound output" role="source" flags="AUDIO_OUTPUT_FLAG_ULTRASOUND">
+                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="primary input" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
@@ -121,11 +124,14 @@
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
+                <mixPort name="ultrasound input" role="sink"
+                         flags="AUDIO_INPUT_FLAG_ULTRASOUND">
+                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
             </mixPorts>
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
@@ -144,6 +150,8 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
+                <devicePort tagName="USB Dock" type="AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET" role="sink">
+                </devicePort>
                 <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
@@ -185,11 +193,9 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="BT A2DP Out"
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="BT A2DP Headphones"
@@ -198,6 +204,8 @@
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="USB Device Out"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
+                <route type="mix" sink="USB Dock"
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="BT SCO"
@@ -221,6 +229,7 @@
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
+                <route type="mix" sink="ultrasound input" sources="Built-In Mic,Built-In Back Mic"/>
             </routes>
         </module>
         <!-- Bluetooth Audio HAL -->
diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 619e544..1fcb527 100644
--- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -18,7 +18,6 @@
             <attachedDevices>
                 <item>Speaker</item>
                 <item>Speaker Safe</item>
-                <item>Earpiece</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
@@ -79,6 +78,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="ultrasound output" role="source" flags="AUDIO_OUTPUT_FLAG_ULTRASOUND">
+                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="primary input" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
@@ -121,11 +124,14 @@
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
+                <mixPort name="ultrasound input" role="sink"
+                         flags="AUDIO_INPUT_FLAG_ULTRASOUND">
+                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
             </mixPorts>
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
@@ -144,6 +150,8 @@
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                 </devicePort>
+                <devicePort tagName="USB Dock" type="AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET" role="sink">
+                </devicePort>
                 <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
@@ -170,15 +178,15 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="USB Device Out"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
+                <route type="mix" sink="USB Dock"
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
                 <route type="mix" sink="BT SCO Headset"
@@ -200,6 +208,7 @@
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
+                <route type="mix" sink="ultrasound input" sources="Built-In Mic,Built-In Back Mic"/>
             </routes>
         </module>
         <!-- Bluetooth Audio HAL -->
diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 80fce29..448b30e 100644
--- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -18,7 +18,6 @@
             <attachedDevices>
                 <item>Speaker</item>
                 <item>Speaker Safe</item>
-                <item>Earpiece</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
                 <item>Telephony Tx</item>
@@ -79,6 +78,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="ultrasound output" role="source" flags="AUDIO_OUTPUT_FLAG_ULTRASOUND">
+                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="primary input" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
@@ -121,11 +124,14 @@
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
+                <mixPort name="ultrasound input" role="sink"
+                         flags="AUDIO_INPUT_FLAG_ULTRASOUND">
+                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
             </mixPorts>
             <devicePorts>
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
                 <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
                 </devicePort>
                 <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
@@ -170,11 +176,9 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,ultrasound output"/>
                 <route type="mix" sink="USB Device Out"
                        sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback"/>
                 <route type="mix" sink="USB Headset Out"
@@ -200,6 +204,7 @@
                        sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
                 <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
                 <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
+                <route type="mix" sink="ultrasound input" sources="Built-In Mic,Built-In Back Mic"/>
             </routes>
         </module>
         <!-- A2dp Audio HAL -->
diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml
index 11fbae9..88fee50 100644
--- a/audio/tangorpro/config/mixer_paths.xml
+++ b/audio/tangorpro/config/mixer_paths.xml
@@ -151,6 +151,7 @@
     <ctl name="TDM_0_RX Mixer NoHost1" value="0"/>
     <ctl name="TDM_0_RX Mixer VOIP" value="0"/>
     <ctl name="TDM_0_RX Mixer RAW" value="0"/>
+    <ctl name="TDM_0_RX Mixer US" value="0"/>
 
     <ctl name="TDM_1_RX Mixer EP1" value="0"/>
     <ctl name="TDM_1_RX Mixer EP2" value="0"/>
@@ -248,6 +249,7 @@
     <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
     <ctl name="NoHost1 TX Mixer INCALL_TX" value="0"/>
 
+    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0"/>
     <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
 
     <!-- AoC Mic setting -->
@@ -281,6 +283,12 @@
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
     <ctl name="Audio Capture Mic Source" value="Builtin_MIC"/>
 
+    <!-- audio Ultrasound mic default state -->
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="-1"/>
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1"/>
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/>
+    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
+
     <!-- sidetone controls -->
     <ctl name="Sidetone Enable" value="0"/>
     <ctl name="Sidetone Volume" value="-96"/>
@@ -414,6 +422,10 @@
     <path name="low-latency-playbackP hearing-aid">
     </path>
 
+    <path name="ultrasound-playbackP">
+        <ctl name="TDM_0_RX Mixer US" value="1"/>
+    </path>
+
     <path name="raw-playbackP">
         <ctl name="TDM_0_RX Mixer RAW" value="1"/>
     </path>
@@ -566,6 +578,10 @@
     </path>
 
     <!-- audio capture dynamic route -->
+    <path name="ultrasound-recordC">
+        <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1"/>
+    </path>
+
     <path name="audio-recordC">
         <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1"/>
     </path>
@@ -871,6 +887,16 @@
         <ctl name="MIC Record Soft Gain (dB)" value="5"/>
     </path>
 
+    <path name="ultrasound-mic">
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/>
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1"/>
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/>
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
+    </path>
+
+    <path name="ultrasound-mic-post">
+    </path>
+
     <path name="bt-mic">
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
@@ -918,4 +944,12 @@
         <ctl name="R2 DSP1 Preload Switch" value="1" />
     </path>
     <!-- cs35l41 specific path to load firmware in cs35l41.c end-->
+
+    <!-- cs35l41 specific path to config ultrasound -->
+    <path name="cs35l41-us-config">
+        <ctl name="ASPRX2 Slot Position" value="2"/>
+        <ctl name="R ASPRX2 Slot Position" value="3"/>
+        <ctl name="DSP RX2 Source" value="ASPRX2"/>
+        <ctl name="R DSP RX2 Source" value="ASPRX2"/>
+    </path>
 </mixer>
diff --git a/audio/tangorpro/tuning/waves/waves_preset.mps b/audio/tangorpro/tuning/waves/waves_preset.mps
index bf4aa60..08e3227 100644
Binary files a/audio/tangorpro/tuning/waves/waves_preset.mps and b/audio/tangorpro/tuning/waves/waves_preset.mps differ