diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml
index 146401d..ee21759 100644
--- a/audio/oriole/config/audio_platform_configuration.xml
+++ b/audio/oriole/config/audio_platform_configuration.xml
@@ -111,9 +111,11 @@
 
     <usecase_attr>
         <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 4 * 10ms buffer -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <usecase id="UC_RAW_PLAYBACK" dev1="3" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
+	<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 10ms buffer -->
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index b7ee8a8..c78d142 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -125,17 +129,17 @@
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
@@ -150,11 +154,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -162,21 +166,21 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 19794e1..b0ddcdf 100644
--- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -135,11 +139,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -147,15 +151,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 0c36d06..b42f3e2 100644
--- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -135,11 +139,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -147,15 +151,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index 0c2ffda..a029f01 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -253,6 +253,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -368,7 +372,7 @@
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+        <ctl name="TDM_0_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP hac-handset">
@@ -378,14 +382,14 @@
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="BT_RX Mixer EP1" value="1"/>
+        <ctl name="BT_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="USB_RX Mixer EP1" value="1"/>
+        <ctl name="USB_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-tty-full">
@@ -400,25 +404,67 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
-    <path name="compress-offload-playbackP">
+    <path name="mmap-playbackP">
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP hac-handset">
+    </path>
+
+    <path name="mmap-playbackP bt">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="2"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="BT_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-headphone">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="4"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="USB_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-tty-full">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-hco">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-vco">
+    </path>
+
+    <path name="mmap-playbackP hearing-aid">
+    </path>
+
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
+    <path name="compress-offload-playbackP">
+        <path name="compress-offload-playback" />
+        <ctl name="SINK_IDS" id="0" value="0"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -434,6 +480,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">
diff --git a/audio/oriole/tuning/bluenote/recording.gatf b/audio/oriole/tuning/bluenote/recording.gatf
index 49fe9ff..6c37fe0 100644
Binary files a/audio/oriole/tuning/bluenote/recording.gatf and b/audio/oriole/tuning/bluenote/recording.gatf differ
diff --git a/audio/oriole/tuning/bluenote/template.xml b/audio/oriole/tuning/bluenote/template.xml
index 2e72a68..8179e3d 100644
--- a/audio/oriole/tuning/bluenote/template.xml
+++ b/audio/oriole/tuning/bluenote/template.xml
@@ -37,15 +37,15 @@
       <param complex="true" id="24" name="ch1_profileAZ" size="1024" type="float"/>
       <param complex="true" id="25" name="ch2_profileAZ" size="1024" type="float"/>
       <struct id="26">
-        <param default="1" max="10" min="0.0" name="ch_gain" type="float"/>
-        <param default="1" max="10" min="0.0" name="zoom_gain" type="float"/>
+        <param default="1" name="ch_gain" type="float"/>
+        <param default="1" name="zoom_gain" type="float"/>
       </struct>
     </module>
-    <module id="7" name="Multi Channel IIR">
+    <module id="7" name="Multi Channel IIR 2">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <param default="3" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
       <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
       <param id="17" name="coeff" size="300" type="float"/>
       <struct id="18">
@@ -71,7 +71,7 @@
         <param max="20" min="0" name="band0_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
         <param max="30" min="0" name="band0_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band0_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
         <param name="band0_threadhold_dB" size="3" type="float"/>
         <param name="band0_compressRatio" size="4" type="float"/>
@@ -82,7 +82,7 @@
         <param max="20" min="0" name="band1_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
         <param max="30" min="0" name="band1_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band1_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
         <param name="band1_threadhold_dB" size="3" type="float"/>
         <param name="band1_compressRatio" size="4" type="float"/>
@@ -93,7 +93,7 @@
         <param max="20" min="0" name="band2_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
         <param max="30" min="0" name="band2_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band2_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
         <param name="band2_threadhold_dB" size="3" type="float"/>
         <param name="band2_compressRatio" size="4" type="float"/>
@@ -103,7 +103,7 @@
         <param name="band2_hysteresis" size="4" type="float"/>
       </struct>
       <struct id="18">
-        <param max="30" min="0" name="limiter_gain_dB" type="float"/>
+        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
         <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
         <param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
         <param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
@@ -116,11 +116,11 @@
     <module id="14" name="Linear Gain">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="linear_gain_dB" type="float"/>
+      <param default="1" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
+      <param id="16" name="Simple_gain" type="float"/>
     </module>
-    <module id="17" name="WNR">
+    <module id="17" name="Wind Noise Reduction">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
@@ -183,7 +183,7 @@
       <param default="450" id="71" name="SSC_SOFT_DECISION_MAX_FREQ" type="int32"/>
       <param default="5" id="72" name="SSC_KEEP_SAVED_PROB_SMOOTH_SIZE" type="int32"/>
     </module>
-    <module id="18" name="IIR 1">
+    <module id="18" name="Multi Channel IIR 1">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
diff --git a/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml b/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml
index a5f51a4..c824fbc 100644
--- a/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml
+++ b/audio/oriole/tuning/bluenote/tuning_constraints_combination.xml
@@ -211,11 +211,11 @@
            rx-path="device_out_usb_others_headset_headphone" />
   <usecase type="playback" name="A2DP"
            rx-path="device_out_bt_a2dp" />
-  <usecase type="record" name="Voice note with main mic"
+  <usecase type="record" name="Voice note with main mic (Google Keep and 3rd party)"
            tx-path="device_in_handset_mic" />
-  <usecase type="record" name="SoloTester with dual mic"
+  <usecase type="record" name="SoloTester with dual mic (3rd party)"
            tx-path="device_in_handset_dual_mic" />
-  <usecase type="record" name="SoloTester with tri mic"
+  <usecase type="record" name="SoloTester with tri mic (3rd party)"
            tx-path="device_in_handset_tri_mic" />
   <usecase type="record" name="Meetings and lectures with rear mic"
            tx-path="device_in_handset_rear_mic" />
@@ -904,13 +904,13 @@
   </usecase-node>
 
   <usecase-node id="usecase_record_voice_note_main_mic" type="record"
-                name="Voice note with main mic" />
+                name="Voice note with main mic (Google Keep and 3rd party)" />
 
   <usecase-node id="usecase_record_solotester_dual_mic" type="record"
-                name="SoloTester with dual mic" />
+                name="SoloTester with dual mic (3rd party)" />
 
   <usecase-node id="usecase_record_solotester_tri_mic" type="record"
-                name="SoloTester with tri mic" />
+                name="SoloTester with tri mic (3rd party)" />
 
   <usecase-node id="usecase_record_meetings_lectures_rear_mic" type="record"
                 name="Meetings and lectures with rear mic" />
diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml
index 146401d..ee21759 100644
--- a/audio/raven/config/audio_platform_configuration.xml
+++ b/audio/raven/config/audio_platform_configuration.xml
@@ -111,9 +111,11 @@
 
     <usecase_attr>
         <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 4 * 10ms buffer -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <usecase id="UC_RAW_PLAYBACK" dev1="3" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
+	<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 10ms buffer -->
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index b7ee8a8..c78d142 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -125,17 +129,17 @@
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
@@ -150,11 +154,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -162,21 +166,21 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 19794e1..b0ddcdf 100644
--- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -135,11 +139,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -147,15 +151,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 0c36d06..b42f3e2 100644
--- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -135,11 +139,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -147,15 +151,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index 93a5934..5f7cb59 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -253,6 +253,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -368,7 +372,7 @@
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+        <ctl name="TDM_0_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP hac-handset">
@@ -378,14 +382,14 @@
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="BT_RX Mixer EP1" value="1"/>
+        <ctl name="BT_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="USB_RX Mixer EP1" value="1"/>
+        <ctl name="USB_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-tty-full">
@@ -400,25 +404,67 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
-    <path name="compress-offload-playbackP">
+    <path name="mmap-playbackP">
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP hac-handset">
+    </path>
+
+    <path name="mmap-playbackP bt">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="2"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="BT_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-headphone">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="4"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="USB_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-tty-full">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-hco">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-vco">
+    </path>
+
+    <path name="mmap-playbackP hearing-aid">
+    </path>
+
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
+    <path name="compress-offload-playbackP">
+        <path name="compress-offload-playback" />
+        <ctl name="SINK_IDS" id="0" value="0"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -434,6 +480,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">
diff --git a/audio/raven/tuning/bluenote/recording.gatf b/audio/raven/tuning/bluenote/recording.gatf
index 49fe9ff..6c37fe0 100644
Binary files a/audio/raven/tuning/bluenote/recording.gatf and b/audio/raven/tuning/bluenote/recording.gatf differ
diff --git a/audio/raven/tuning/bluenote/template.xml b/audio/raven/tuning/bluenote/template.xml
index 2e72a68..8179e3d 100644
--- a/audio/raven/tuning/bluenote/template.xml
+++ b/audio/raven/tuning/bluenote/template.xml
@@ -37,15 +37,15 @@
       <param complex="true" id="24" name="ch1_profileAZ" size="1024" type="float"/>
       <param complex="true" id="25" name="ch2_profileAZ" size="1024" type="float"/>
       <struct id="26">
-        <param default="1" max="10" min="0.0" name="ch_gain" type="float"/>
-        <param default="1" max="10" min="0.0" name="zoom_gain" type="float"/>
+        <param default="1" name="ch_gain" type="float"/>
+        <param default="1" name="zoom_gain" type="float"/>
       </struct>
     </module>
-    <module id="7" name="Multi Channel IIR">
+    <module id="7" name="Multi Channel IIR 2">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
+      <param default="3" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
       <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
       <param id="17" name="coeff" size="300" type="float"/>
       <struct id="18">
@@ -71,7 +71,7 @@
         <param max="20" min="0" name="band0_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
         <param max="30" min="0" name="band0_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band0_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
         <param name="band0_threadhold_dB" size="3" type="float"/>
         <param name="band0_compressRatio" size="4" type="float"/>
@@ -82,7 +82,7 @@
         <param max="20" min="0" name="band1_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
         <param max="30" min="0" name="band1_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band1_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
         <param name="band1_threadhold_dB" size="3" type="float"/>
         <param name="band1_compressRatio" size="4" type="float"/>
@@ -93,7 +93,7 @@
         <param max="20" min="0" name="band2_delay_ms" type="float"/>
         <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
         <param max="30" min="0" name="band2_gain_dB" type="float"/>
-        <param max="0" min="-30" name="band2_Min_Gain_dB" type="float"/>
+        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
         <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
         <param name="band2_threadhold_dB" size="3" type="float"/>
         <param name="band2_compressRatio" size="4" type="float"/>
@@ -103,7 +103,7 @@
         <param name="band2_hysteresis" size="4" type="float"/>
       </struct>
       <struct id="18">
-        <param max="30" min="0" name="limiter_gain_dB" type="float"/>
+        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
         <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
         <param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
         <param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
@@ -116,11 +116,11 @@
     <module id="14" name="Linear Gain">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="linear_gain_dB" type="float"/>
+      <param default="1" id="2" name="numCh_" type="uint32"/>
+      <param default="1" id="3" name="chMask_" type="uint32"/>
+      <param id="16" name="Simple_gain" type="float"/>
     </module>
-    <module id="17" name="WNR">
+    <module id="17" name="Wind Noise Reduction">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
@@ -183,7 +183,7 @@
       <param default="450" id="71" name="SSC_SOFT_DECISION_MAX_FREQ" type="int32"/>
       <param default="5" id="72" name="SSC_KEEP_SAVED_PROB_SMOOTH_SIZE" type="int32"/>
     </module>
-    <module id="18" name="IIR 1">
+    <module id="18" name="Multi Channel IIR 1">
       <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
       <param default="48000" id="1" name="fs_" type="uint32"/>
       <param default="2" id="2" name="numCh_" type="uint32"/>
diff --git a/audio/raven/tuning/bluenote/tuning_constraints_combination.xml b/audio/raven/tuning/bluenote/tuning_constraints_combination.xml
index a5f51a4..c824fbc 100644
--- a/audio/raven/tuning/bluenote/tuning_constraints_combination.xml
+++ b/audio/raven/tuning/bluenote/tuning_constraints_combination.xml
@@ -211,11 +211,11 @@
            rx-path="device_out_usb_others_headset_headphone" />
   <usecase type="playback" name="A2DP"
            rx-path="device_out_bt_a2dp" />
-  <usecase type="record" name="Voice note with main mic"
+  <usecase type="record" name="Voice note with main mic (Google Keep and 3rd party)"
            tx-path="device_in_handset_mic" />
-  <usecase type="record" name="SoloTester with dual mic"
+  <usecase type="record" name="SoloTester with dual mic (3rd party)"
            tx-path="device_in_handset_dual_mic" />
-  <usecase type="record" name="SoloTester with tri mic"
+  <usecase type="record" name="SoloTester with tri mic (3rd party)"
            tx-path="device_in_handset_tri_mic" />
   <usecase type="record" name="Meetings and lectures with rear mic"
            tx-path="device_in_handset_rear_mic" />
@@ -904,13 +904,13 @@
   </usecase-node>
 
   <usecase-node id="usecase_record_voice_note_main_mic" type="record"
-                name="Voice note with main mic" />
+                name="Voice note with main mic (Google Keep and 3rd party)" />
 
   <usecase-node id="usecase_record_solotester_dual_mic" type="record"
-                name="SoloTester with dual mic" />
+                name="SoloTester with dual mic (3rd party)" />
 
   <usecase-node id="usecase_record_solotester_tri_mic" type="record"
-                name="SoloTester with tri mic" />
+                name="SoloTester with tri mic (3rd party)" />
 
   <usecase-node id="usecase_record_meetings_lectures_rear_mic" type="record"
                 name="Meetings and lectures with rear mic" />
diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml
index 23d4955..d903af4 100644
--- a/audio/slider/config/audio_platform_configuration.xml
+++ b/audio/slider/config/audio_platform_configuration.xml
@@ -111,9 +111,11 @@
 
     <usecase_attr>
         <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 4 * 10ms buffer -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <usecase id="UC_RAW_PLAYBACK" dev1="3" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
+	<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 10ms buffer -->
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml
index b7ee8a8..c78d142 100644
--- a/audio/slider/config/audio_policy_configuration.xml
+++ b/audio/slider/config/audio_policy_configuration.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -125,17 +129,17 @@
                 <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC">
+                            encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
@@ -150,11 +154,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -162,21 +166,21 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 19794e1..b0ddcdf 100644
--- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -135,11 +139,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -147,15 +151,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 0c36d06..b42f3e2 100644
--- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -57,6 +57,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -135,11 +139,11 @@
             <!-- 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"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -147,15 +151,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml
index d2c10f4..460cb39 100644
--- a/audio/slider/config/mixer_paths.xml
+++ b/audio/slider/config/mixer_paths.xml
@@ -217,6 +217,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -332,7 +336,7 @@
         <ctl name="PCM Playback Volume" value="250"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+        <ctl name="TDM_0_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP hac-handset">
@@ -342,14 +346,14 @@
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="BT_RX Mixer EP1" value="1"/>
+        <ctl name="BT_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="USB_RX Mixer EP1" value="1"/>
+        <ctl name="USB_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-tty-full">
@@ -364,25 +368,67 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
-    <path name="compress-offload-playbackP">
+    <path name="mmap-playbackP">
         <ctl name="PCM Playback Volume" value="250"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP hac-handset">
+    </path>
+
+    <path name="mmap-playbackP bt">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="2"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="BT_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-headphone">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="4"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="USB_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-tty-full">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-hco">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-vco">
+    </path>
+
+    <path name="mmap-playbackP hearing-aid">
+    </path>
+
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
+    <path name="compress-offload-playbackP">
+        <path name="compress-offload-playback" />
+        <ctl name="SINK_IDS" id="0" value="0"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -398,6 +444,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">
diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml
index 23d4955..d903af4 100644
--- a/audio/whitefin/config/audio_platform_configuration.xml
+++ b/audio/whitefin/config/audio_platform_configuration.xml
@@ -111,9 +111,11 @@
 
     <usecase_attr>
         <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 4 * 10ms buffer -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <usecase id="UC_RAW_PLAYBACK" dev1="3" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 80 periods * 48 frames/period(=1ms w/ 48k sample rate) * 4 bytes/frame = 15360 bytes -->
+	<usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="80"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 10ms buffer -->
         <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml
index 31f5c57..c501061 100644
--- a/audio/whitefin/config/audio_policy_configuration.xml
+++ b/audio/whitefin/config/audio_policy_configuration.xml
@@ -52,6 +52,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -130,11 +134,11 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -142,15 +146,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 4b62caa..a83de6d 100644
--- a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -52,6 +52,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -130,11 +134,11 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -142,15 +146,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index d4955f4..f661328 100644
--- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -52,6 +52,10 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
                 <mixPort name="incall playback" role="source"
                          flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -130,11 +134,11 @@
             <!-- route declaration, i.e. list all available sources for a given sink -->
             <routes>
                 <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="primary input"
                        sources="Built-In Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
                 <route type="mix" sink="hotword input"
@@ -142,15 +146,15 @@
                 <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
                 <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,raw,compressed_offload"/>
+                       sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/>
                 <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
             </routes>
         </module>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index 86c8a85..03a9f5e 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -254,6 +254,10 @@
     <ctl name="Incall Capture Stream1" value="Off"/>
     <ctl name="Incall Capture Stream2" value="Off"/>
 
+    <!-- Decoder Reference Enable is controlled in aoc_control -->
+    <ctl name="Decoder Reference Enable" value="0"/>
+    <ctl name="LVM Enable" value="0"/>
+
     <!-- sidetone dynamic control -->
     <path name="sidetone-for handset">
         <!-- 1065353216 = 0x3f800000 = 1.0 -->
@@ -369,7 +373,7 @@
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+        <ctl name="TDM_0_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP hac-handset">
@@ -379,14 +383,14 @@
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="BT_RX Mixer EP1" value="1"/>
+        <ctl name="BT_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-headphone">
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="USB_RX Mixer EP1" value="1"/>
+        <ctl name="USB_RX Mixer EP4" value="1"/>
     </path>
 
     <path name="raw-playbackP usb-tty-full">
@@ -401,25 +405,67 @@
     <path name="raw-playbackP hearing-aid">
     </path>
 
-    <path name="compress-offload-playbackP">
+    <path name="mmap-playbackP">
         <ctl name="PCM Playback Volume" value="1000"/>
         <ctl name="SINK_IDS" id="0" value="0"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP hac-handset">
+    </path>
+
+    <path name="mmap-playbackP bt">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="2"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="BT_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-headphone">
+        <ctl name="PCM Playback Volume" value="1000"/>
+        <ctl name="SINK_IDS" id="0" value="4"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
+        <ctl name="USB_RX Mixer EP1" value="1"/>
+    </path>
+
+    <path name="mmap-playbackP usb-tty-full">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-hco">
+    </path>
+
+    <path name="mmap-playbackP usb-tty-vco">
+    </path>
+
+    <path name="mmap-playbackP hearing-aid">
+    </path>
+
+    <path name="compress-offload-playback">
+        <ctl name="PCM Playback Volume" value="1000" />
+        <ctl name="LVM Enable" value="1" />
+    </path>
+
+    <path name="compress-offload-playbackP">
+        <path name="compress-offload-playback" />
+        <ctl name="SINK_IDS" id="0" value="0"/>
+        <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="TDM_0_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP hac-handset">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="compress-offload-playbackP bt">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="2"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="BT_RX Mixer EP7" value="1"/>
     </path>
 
     <path name="compress-offload-playbackP usb-headphone">
-        <ctl name="PCM Playback Volume" value="1000"/>
+        <path name="compress-offload-playback" />
         <ctl name="SINK_IDS" id="0" value="4"/>
         <ctl name="SINK_IDS" id="1" value="-1"/>
         <ctl name="USB_RX Mixer EP7" value="1"/>
@@ -435,6 +481,7 @@
     </path>
 
     <path name="compress-offload-playbackP hearing-aid">
+        <path name="compress-offload-playback" />
     </path>
 
     <path name="voip-playbackP">
diff --git a/device-oriole.mk b/device-oriole.mk
index e0cd622..ab1a6ad 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -48,7 +48,8 @@ PRODUCT_COPY_FILES += \
 
 # MIPI Coex Configs
 PRODUCT_COPY_FILES += \
-    device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv
+    device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \
+    device/google/raviole/radio/oriole_camera_front_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_front_mipi_coex_table.csv
 
 # Camera
 PRODUCT_COPY_FILES += \
diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index a0f185f..fbffec0 100644
--- a/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -176,11 +176,11 @@
     <item name="gps.voltage">3700</item>
 
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">98</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">470</item>
     <!-- Operating volatage for wifi radio in mV.-->
     <item name="wifi.controller.voltage">3700</item>
 </device>
diff --git a/radio/oriole_camera_front_mipi_coex_table.csv b/radio/oriole_camera_front_mipi_coex_table.csv
new file mode 100644
index 0000000..c21cd6b
--- /dev/null
+++ b/radio/oriole_camera_front_mipi_coex_table.csv
@@ -0,0 +1,7 @@
+694270,706560
+
+930000,955000,694270
+2446000,2473000,694270
+5640000,5840000,694270
+2412000,2442000,706560
+5500000,5600000,706560
diff --git a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index a0f185f..fbffec0 100644
--- a/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/raven/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -176,11 +176,11 @@
     <item name="gps.voltage">3700</item>
 
     <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
+    <item name="wifi.controller.idle">38</item>
     <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
+    <item name="wifi.controller.rx">98</item>
     <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
+    <item name="wifi.controller.tx">470</item>
     <!-- Operating volatage for wifi radio in mV.-->
     <item name="wifi.controller.voltage">3700</item>
 </device>
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index afa79f0..a2e12e5 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -295,6 +295,35 @@
             "Multiplier":1,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "vdroop1"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1200"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                 3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 872b284..b6689c5 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -295,6 +295,35 @@
             "Multiplier":1,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "vdroop1",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "vdroop1"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1200"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",
diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json
index b4c90a0..b2735b9 100644
--- a/thermal_info_config_slider.json
+++ b/thermal_info_config_slider.json
@@ -102,6 +102,35 @@
             "Multiplier":0.001,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "smpl_gm",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "smpl_gm"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1400"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",
diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json
index b4c90a0..b2735b9 100644
--- a/thermal_info_config_whitefin.json
+++ b/thermal_info_config_whitefin.json
@@ -102,6 +102,35 @@
             "Multiplier":0.001,
             "Monitor":false
         },
+        {
+            "Name":"critical-battery-cell",
+            "Type":"BCL_VOLTAGE",
+            "VirtualSensor":true,
+            "Formula":"COUNT_THRESHOLD",
+            "TriggerSensor": "smpl_gm",
+            "Combination":[
+                "battery",
+                "battery_cycle",
+                "smpl_gm"
+            ],
+            "Coefficient":[
+                "-10000",
+                "400",
+                "1400"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                3.00,
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":1,
+            "Monitor":true
+        },
         {
             "Name":"FLASH_LED_REDUCE",
             "Type":"UNKNOWN",