configs: msmnile_au: enable mmap for more bus

Revert the changes for mmap playback for phone bus.
And add in generic way for more buses.
User needs to specify the BUS id, to get selected.

Change-Id: I38c7565d98e05323e2b64930845e1d7d78c2f5f6
diff --git a/configs/common_au/audio_policy_configuration.xml b/configs/common_au/audio_policy_configuration.xml
index 9c5fbb4..a851fbf 100644
--- a/configs/common_au/audio_policy_configuration.xml
+++ b/configs/common_au/audio_policy_configuration.xml
@@ -339,21 +339,21 @@
             </devicePorts>
             <routes>
                 <route type="mix" sink="Media Bus"
-                       sources="media"/>
+                       sources="media,mmap_no_irq_out"/>
                 <route type="mix" sink="Sys Notification Bus"
-                       sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>
+                       sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys,mmap_no_irq_out"/>
                 <route type="mix" sink="Nav Guidance Bus"
-                       sources="nav_guidance"/>
+                       sources="nav_guidance,mmap_no_irq_out"/>
                 <route type="mix" sink="Phone Bus"
-                       sources="phone"/>
+                       sources="phone,mmap_no_irq_out"/>
                 <route type="mix" sink="Alerts Bus"
                        sources="alerts"/>
                 <route type="mix" sink="Front Passenger Bus"
-                       sources="front_passenger"/>
+                       sources="front_passenger,mmap_no_irq_out"/>
                 <route type="mix" sink="Rear Seat Bus"
-                       sources="rear_seat"/>
+                       sources="rear_seat,mmap_no_irq_out"/>
                 <route type="mix" sink="Earpiece"
-                       sources="primary output,raw,deep_buffer,mmap_no_irq_out,voip_rx"/>
+                       sources="primary output,raw,deep_buffer,mmap_no_irq_out,voip_rx,mmap_no_irq_out"/>
                 <route type="mix" sink="Speaker"
                        sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
                 <route type="mix" sink="Speaker Safe"
diff --git a/configs/msmnile_au/audio_policy_mmap_configuration.xml b/configs/msmnile_au/audio_policy_mmap_configuration.xml
deleted file mode 100644
index a3ddf0d..0000000
--- a/configs/msmnile_au/audio_policy_mmap_configuration.xml
+++ /dev/null
@@ -1,415 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (c) 2016-2017, 2019, The Linux Foundation. All rights reserved
-     Not a Contribution.
--->
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!-- Changes from Qualcomm Innovation Center are provided under the following license:
-     Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
-     SPDX-License-Identifier: BSD-3-Clause-Clear
--->
-
-<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
-
-    <!-- Global configuration Decalaration -->
-    <globalConfiguration speaker_drc_enabled="true"/>
-
-
-    <!-- Modules section:
-        There is one section per audio HW module present on the platform.
-        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
-        The module names are the same as in current .conf file:
-                “primary”, “A2DP”, “remote_submix”, “USB”
-        Each module will contain the following sections:
-        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
-        module.
-        This contains both permanently attached devices and removable devices.
-            "gain": constraints applied to the millibel values:
-                - maxValueMB >= minValueMB
-                - defaultValueMB >= minValueMB && defaultValueMB <= maxValueMB
-                - (maxValueMB - minValueMB) % stepValueMB == 0
-                - (defaultValueMB - minValueMB) % stepValueMB == 0
-        “mixPorts”: listing all output and input streams exposed by the audio HAL
-        “routes”: list of possible connections between input and output devices or between stream and
-        devices.
-            "route": is defined by an attribute:
-                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
-                -"sink": the sink involved in this route
-                -"sources": all the sources than can be connected to the sink via vis route
-        “attachedDevices”: permanently attached devices.
-        The attachedDevices section is a list of devices names. The names correspond to device names
-        defined in <devicePorts> section.
-        “defaultOutputDevice”: device to be used by default when no policy rule applies
-    -->
-    <modules>
-        <module name="primary" halVersion="3.0">
-            <attachedDevices>
-                <item>Media Bus</item>
-                <item>Sys Notification Bus</item>
-                <item>Nav Guidance Bus</item>
-                <item>Phone Bus</item>
-                <item>Alerts Bus</item>
-                <item>Front Passenger Bus</item>
-                <item>Rear Seat Bus</item>
-                <item>Built-In Mic</item>
-                <item>Built-In Back Mic</item>
-                <item>Primary In Bus</item>
-                <item>Front Passenger In Bus</item>
-                <item>Rear Seat In Bus</item>
-                <item>Echo Reference</item>
-                <item>FM Tuner</item>
-            </attachedDevices>
-            <defaultOutputDevice>Media Bus</defaultOutputDevice>
-            <mixPorts>
-                <mixPort name="media" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_PRIMARY">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="sys_notification" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="carplay_8k_sys" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                        samplingRates="8000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="carplay_16k_sys" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                        samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="carplay_24k_sys" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                        samplingRates="24000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="carplay_32k_sys" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                        samplingRates="32000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="carplay_48k_sys" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                        samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="mixport_tuner0" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="nav_guidance" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="phone" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_DIRECT">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="alerts" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="front_passenger" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="rear_seat" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW|AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="deep_buffer" role="source"
-                        flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
-                             samplingRates="44100,48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
-                    <profile name="" format="AUDIO_FORMAT_MP3"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-                </mixPort>
-                <mixPort name="voice_tx" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,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="8000,16000,24000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="voip_rx" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                           samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="incall_music_uplink" role="source"
-                        flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="primary input" role="sink" maxOpenCount="3" maxActiveCount="3">
-                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
-                </mixPort>
-                <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
-                </mixPort>
-                <mixPort name="voice_rx" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
-                </mixPort>
-                <mixPort name="voip_tx" role="sink"
-                         flags="AUDIO_INPUT_FLAG_VOIP_TX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="echo_ref" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <devicePort tagName="Media Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                        address="BUS00_MEDIA">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Sys Notification Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                        address="BUS01_SYS_NOTIFICATION">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Nav Guidance Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                        address="BUS02_NAV_GUIDANCE">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Phone Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                        address="BUS03_PHONE">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Alerts Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                        address="BUS05_ALERTS">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Front Passenger Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                        address="BUS08_FRONT_PASSENGER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Rear Seat Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                        address="BUS16_REAR_SEAT">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
-                </devicePort>
-                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
-                </devicePort>
-                <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
-                </devicePort>
-                <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">
-                </devicePort>
-                <devicePort tagName="Primary In Bus" type="AUDIO_DEVICE_IN_BUS" role="source" address="BUS04_INPUT">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Front Passenger In Bus" type="AUDIO_DEVICE_IN_BUS" role="source" address="BUS09_INPUT_FRONT_PASSENGER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Rear Seat In Bus" type="AUDIO_DEVICE_IN_BUS" role="source" address="BUS17_INPUT_REAR_SEAT">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                    <gains>
-                        <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                                minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
-                    </gains>
-                </devicePort>
-                <devicePort tagName="Echo Reference" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="16000,48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </devicePort>
-                <devicePort tagName="FM Tuner" type="AUDIO_DEVICE_IN_FM_TUNER" role="source"> 
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </devicePort>
-            </devicePorts>
-            <routes>
-                <route type="mix" sink="Media Bus"
-                       sources="media"/>
-                <route type="mix" sink="Sys Notification Bus"
-                       sources="sys_notification,carplay_8k_sys,carplay_16k_sys,carplay_24k_sys,carplay_32k_sys,carplay_48k_sys"/>
-                <route type="mix" sink="Nav Guidance Bus"
-                       sources="nav_guidance"/>
-                <route type="mix" sink="Phone Bus"
-                       sources="phone,mmap_no_irq_out"/>
-                <route type="mix" sink="Alerts Bus"
-                       sources="alerts"/>
-                <route type="mix" sink="Front Passenger Bus"
-                       sources="front_passenger"/>
-                <route type="mix" sink="Rear Seat Bus"
-                       sources="rear_seat"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,raw,deep_buffer,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="Speaker"
-                       sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,raw,deep_buffer,compressed_offload,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="BT SCO"
-                       sources="primary output,raw,deep_buffer,voip_rx"/>
-                <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,raw,deep_buffer,voip_rx"/>
-                <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,raw,deep_buffer,voip_rx"/>
-                <route type="mix" sink="Telephony Tx"
-                       sources="voice_tx,incall_music_uplink"/>
-                <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Primary In Bus,Front Passenger In Bus,Rear Seat In Bus"/>
-                <route type="mix" sink="echo_ref"
-                       sources="Echo Reference"/>
-                <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
-                <route type="mix" sink="voice_rx"
-                       sources="Telephony Rx"/>
-                <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic"/>
-                <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
-                <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
-                <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
-                <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep_buffer,compressed_offload,voip_rx"/>
-                <route type="mix" sink="mixport_tuner0"
-                       sources="FM Tuner"/>
-            </routes>
-        </module>
-
-        <!-- A2DP Input Audio HAL -->
-        <xi:include href="a2dp_audio_policy_configuration.xml"/>
-
-        <!-- Usb Audio HAL -->
-        <xi:include href="usb_audio_policy_configuration.xml"/>
-
-        <!-- Remote Submix Audio HAL -->
-        <xi:include href="r_submix_audio_policy_configuration.xml"/>
-
-    </modules>
-    <!-- End of Modules section -->
-
-    <!-- Volume section -->
-
-    <xi:include href="audio_policy_volumes.xml"/>
-    <xi:include href="default_volume_tables.xml"/>
-
-    <!-- End of Volume section -->
-
-</audioPolicyConfiguration>
diff --git a/configs/msmnile_au/mixer_paths_mmap_adp.xml b/configs/msmnile_au/mixer_paths_mmap_adp.xml
deleted file mode 100644
index 8cbf940..0000000
--- a/configs/msmnile_au/mixer_paths_mmap_adp.xml
+++ /dev/null
@@ -1,1161 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.    -->
-<!--                                                                        -->
-<!-- Redistribution and use in source and binary forms, with or without     -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met:                                                                   -->
-<!--     * Redistributions of source code must retain the above copyright   -->
-<!--       notice, this list of conditions and the following disclaimer.    -->
-<!--     * Redistributions in binary form must reproduce the above          -->
-<!--       copyright notice, this list of conditions and the following      -->
-<!--       disclaimer in the documentation and/or other materials provided  -->
-<!--       with the distribution.                                           -->
-<!--     * Neither the name of The Linux Foundation nor the names of its    -->
-<!--       contributors may be used to endorse or promote products derived  -->
-<!--       from this software without specific prior written permission.    -->
-<!--                                                                        -->
-<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED           -->
-<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF   -->
-<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
-<!-- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
-<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
-<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF   -->
-<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR        -->
-<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->
-<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
-<!--                                                                        -->
-<!-- Changes from Qualcomm Innovation Center are provided,		    -->
-<!-- under the following license:					    -->
-<!-- Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.-->
-<!-- SPDX-License-Identifier: BSD-3-Clause-Clear			    -->
-<!--                                                                        -->
-<mixer>
-    <!-- These are the initial mixer settings -->
-    <!-- Example commands to Enable the paired rx usecase-->
-    <!-- SlotMapping with the last possible slot of respective TDM interface -->
-    <!-- <ctl name="TERT_TDM_RX_3 SlotMapping" id = "0" value="28"/>
-    <ctl name="TERT_TDM_RX_3 SlotMapping" id = "1" value="65535" />
-    <ctl name="TERT_TDM_RX_3 Channels" value="One" />
-    <ctl name="TERT_TDM Paired_Rx" value="TERT_TDM_RX_3" />
-
-    <ctl name="QUAT_TDM_RX_3 SlotMapping" id = "0" value="124"/>
-    <ctl name="QUAT_TDM_RX_3 SlotMapping" id = "1" value="65535" />
-    <ctl name="QUAT_TDM_RX_3 Channels" value="One" />
-    <ctl name="QUAT_TDM Paired_Rx" value="QUAT_TDM_RX_3" />
-
-    <ctl name="QUIN_TDM_RX_3 SlotMapping" id = "0" value="60"/>
-    <ctl name="QUIN_TDM_RX_3 SlotMapping" id = "1" value="65535" />
-    <ctl name="QUIN_TDM_RX_3 Channels" value="One" />
-    <ctl name="QUIN_TDM Paired_Rx" value="QUIN_TDM_RX_3" /> -->
-
-    <ctl name="MultiMedia5 Mixer AFE_PCM_TX" value="0" />
-    <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="0" />
-    <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="0" />
-    <ctl name="MultiMedia10 Mixer AFE_PCM_TX" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="0" />
-    <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="0" />
-    <!-- echo reference -->
-    <ctl name="AUDIO_REF_EC_UL1 MUX" value="None" />
-    <!-- usb headset -->
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="0" />
-    <ctl name="MultiMedia1 Mixer AFE_PCM_TX" value="0" />
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="0" />
-    <!-- usb headset end -->
-
-    <!-- RT Proxy Cal -->
-    <ctl name="RT_PROXY_1_RX SetCalMode" value="CAL_MODE_NONE" />
-    <ctl name="RT_PROXY_1_TX SetCalMode" value="CAL_MODE_NONE" />
-    <!-- RT Proxy Cal end -->
-
-    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia3" value="0" />
-
-    <!-- hfp-sco -->
-    <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="0" />
-    <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="0" />
-    <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="0" />
-    <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="0" />
-
-    <!-- icc-call and anc-loopback -->
-    <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="0" />
-    <ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="0" />
-
-    <path name="synth-loopback">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-    <!-- These are audio route (FE to BE) specific mixer settings -->
-
-    <!-- EC Reference -->
-    <ctl name="EC Reference Channels" value="Zero" />
-    <ctl name="EC Reference SampleRate" value="0" />
-    <ctl name="EC Reference Bit Format" value="0" />
-    <!-- EC Reference end -->
-
-    <path name="echo-reference">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="TERT_TDM_RX_2" />
-        <ctl name="EC Reference Channels" value="One" />
-        <ctl name="EC Reference Bit Format" value="S16_LE" />
-        <ctl name="EC Reference SampleRate" value="48000" />
-    </path>
-
-    <path name="echo-reference headphones">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_6_RX" />
-    </path>
-
-    <path name="echo-reference headset">
-        <path name="echo-reference headphones" />
-    </path>
-
-    <path name="echo-reference display-port">
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="DISPLAY_PORT" />
-    </path>
-
-    <path name="echo-reference headphones-44.1">
-    </path>
-
-    <path name="multi-mic-echo-reference">
-        <ctl name="SEC_TDM_TX_0 SampleRate" value="KHZ_16" />
-        <ctl name="SEC_TDM_TX_0 Channels" value="Six" />
-        <ctl name="MultiMedia2 Mixer SEC_TDM_TX_0" value="1" />
-        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SEC_TDM_TX_0" />
-        <!-- EC Reference supports up to Eight channels -->
-        <ctl name="EC Reference Channels" value="Four" />
-        <!-- ctl name="EC Reference SampleRate" supports 8000, 16000, 32000,
-             44100, 48000, 96000, 192000, 384000 -->
-        <!-- ctl name="EC Reference Bit Format" supports S16_LE and S24_LE -->
-    </path>
-
-    <path name="deep-buffer-playback">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-protected">
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-safe">
-        <path name="deep-buffer-playback" />
-    </path>
-
-    <path name="deep-buffer-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="low-latency-playback">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback speaker-protected">
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="low-latency-playback speaker-safe">
-        <path name="low-latency-playback" />
-    </path>
-
-    <path name="low-latency-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="low-latency-playback resume">
-        <ctl name="MultiMedia5_RX QOS Vote" value="Enable" />
-    </path>
-
-    <path name="audio-ull-playback">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia8" value="1" />
-    </path>
-
-    <path name="audio-ull-playback speaker-protected">
-        <path name="audio-ull-playback" />
-    </path>
-
-    <path name="audio-ull-playback speaker-safe">
-        <path name="audio-ull-playback" />
-    </path>
-
-    <path name="audio-ull-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia8" value="1" />
-    </path>
-
-    <path name="multi-channel-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="compress-offload-playback">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback speaker-protected">
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="compress-offload-playback speaker-safe">
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="compress-offload-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia4" value="1" />
-    </path>
-
-    <path name="compress-offload-playback2">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia7" value="1" />
-    </path>
-
-    <path name="compress-offload-playback2 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
-    </path>
-
-    <path name="compress-offload-playback3">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="compress-offload-playback3 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="compress-offload-playback4">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia11" value="1" />
-    </path>
-
-    <path name="compress-offload-playback4 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia11" value="1" />
-    </path>
-
-    <path name="compress-offload-playback5">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia12" value="1" />
-    </path>
-
-    <path name="compress-offload-playback5 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia12" value="1" />
-    </path>
-
-    <path name="compress-offload-playback6">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia13" value="1" />
-    </path>
-
-    <path name="compress-offload-playback6 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia13" value="1" />
-    </path>
-
-    <path name="compress-offload-playback7">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia14" value="1" />
-    </path>
-
-    <path name="compress-offload-playback7 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia14" value="1" />
-    </path>
-
-    <path name="compress-offload-playback8">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia15" value="1" />
-    </path>
-
-    <path name="compress-offload-playback8 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia15" value="1" />
-    </path>
-
-    <path name="compress-offload-playback9">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="compress-offload-playback9 afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <!-- The following use cases are used for car streams  -->
-    <path name="media-playback">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia1" value="1" />
-    </path>
-
-    <path name="sys-notification-playback sys-bus-out">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia5" value="1" />
-    </path>
-
-    <path name="nav-guidance-playback nav-bus-out">
-        <ctl name="TERT_TDM_RX_1 Channels" value="One" />
-        <ctl name="TERT_TDM_RX_1 Audio Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="phone-playback phone-bus-out">
-        <ctl name="TERT_TDM_RX_2 Channels" value="One" />
-        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="alerts-playback alerts-bus-out">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia31" value="1" />
-    </path>
-
-    <path name="front-passenger-playback pax-bus-out">
-        <ctl name="QUAT_TDM_RX_0 Channels" value="Eight" />
-        <ctl name="QUAT_TDM_RX_0 Audio Mixer MultiMedia23" value="1" />
-    </path>
-
-    <path name="rear-seat-playback rse-bus-out">
-        <ctl name="QUIN_TDM_RX_0 Channels" value="Sixteen" />
-        <ctl name="QUIN_TDM_RX_0 Audio Mixer MultiMedia22" value="1" />
-    </path>
-
-    <path name="audio-record">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
-        <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
-    </path>
-
-    <path name="audio-record2">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="MultiMedia33 Mixer TERT_TDM_TX_0" value="1" />
-        <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
-    </path>
-
-    <path name="audio-record3">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="MultiMedia34 Mixer TERT_TDM_TX_0" value="1" />
-        <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
-    </path>
-
-    <path name="front-passenger-record">
-        <ctl name="QUAT_TDM_TX_0 Channels" value="Eight" />
-        <ctl name="MultiMedia23 Mixer QUAT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="rear-seat-record">
-        <ctl name="QUIN_TDM_TX_0 Channels" value="Eight" />
-        <ctl name="MultiMedia22 Mixer QUIN_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="audio-record headset-mic">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="audio-record capture-fm">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="echo-reference-external">
-        <ctl name="MultiMedia2 Mixer SEC_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="audio-record-compress">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="audio-record-compress headset-mic">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="audio-record-compress2">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia17 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="audio-record-compress2 headset-mic">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia17 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="low-latency-record">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="low-latency-record headset-mic">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="low-latency-record capture-fm">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-      <ctl name="MultiMedia8 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="fm-virtual-record capture-fm">
-        <ctl name="TERT_TDM_TX_0 Channels" value="One" />
-        <ctl name="MultiMedia2 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="icc-call">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="anc-loopback">
-        <ctl name="SEC_TDM_RX_0 Channels" value="Four" />
-        <ctl name="SEC_TDM_RX_0 Audio Mixer MultiMedia9" value="1" />
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="MultiMedia9 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="hfp-sco headphones">
-    </path>
-
-    <path name="hfp-sco-wb headphones">
-        <path name="hfp-sco headphones" />
-    </path>
-
-    <path name="hfp-sco headset">
-        <path name="hfp-sco headphones" />
-    </path>
-
-    <path name="hfp-sco">
-        <ctl name="AUX_PCM_RX Audio Mixer MultiMedia6" value="1" />
-        <ctl name="MultiMedia6 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="hfp-sco bt-sco">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="TERT_TDM_TX_0 ADM Channels" value="One" />
-        <path name="hfp-sco" />
-    </path>
-
-    <path name="hfp-sco bt-sco-mmsecns">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
-        <path name="hfp-sco" />
-    </path>
-
-    <path name="hfp-sco-wb">
-        <ctl name="PRIM_AUX_PCM_RX SampleRate" value="KHZ_16" />
-        <path name="hfp-sco" />
-    </path>
-
-    <path name="hfp-sco-wb bt-sco-wb">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="TERT_TDM_TX_0 ADM Channels" value="One" />
-        <path name="hfp-sco-wb" />
-    </path>
-
-    <path name="hfp-sco-wb bt-sco-mmsecns">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="TERT_TDM_TX_0 ADM Channels" value="Four" />
-        <path name="hfp-sco-wb" />
-    </path>
-
-
-    <path name="hfp-sco-wb headset">
-        <path name="hfp-sco headphones" />
-    </path>
-
-    <path name="hfp-sco-downlink">
-        <ctl name="TERT_TDM_RX_2 Audio Mixer MultiMedia21" value="1" />
-        <ctl name="MultiMedia21 Mixer AUX_PCM_UL_TX" value="1" />
-    </path>
-
-    <path name="hfp-sco-wb-downlink">
-        <ctl name="PRIM_AUX_PCM_TX SampleRate" value="KHZ_16" />
-        <path name="hfp-sco-downlink" />
-    </path>
-
-    <!-- VoIP Rx settings -->
-    <path name="audio-playback-voip">
-        <ctl name="TERT_TDM_RX_0 Channels" value="Six" />
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <path name="audio-playback-voip afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia10" value="1" />
-    </path>
-
-    <!-- VoIP Tx settings -->
-
-    <path name="spkr-vi-record">
-    </path>
-
-    <!-- These are actual sound device specific mixer settings -->
-    <path name="amic1">
-    </path>
-
-    <path name="amic2">
-    </path>
-
-    <!-- For Tavil, DMIC numbered from 0 to 5 -->
-    <path name="dmic1">
-    </path>
-
-    <path name="dmic2">
-    </path>
-
-    <path name="dmic3">
-    </path>
-
-    <path name="dmic4">
-    </path>
-
-    <path name="dmic5">
-    </path>
-
-    <path name="dmic6">
-    </path>
-
-    <path name="speaker">
-    </path>
-
-    <path name="speaker-mono">
-        <ctl name="TERT_TDM_RX_0 Channels" value="One" />
-    </path>
-
-    <path name="speaker-mono-2">
-    </path>
-
-    <path name="speaker-qrd">
-        <path name="speaker-mono-2" />
-    </path>
-
-    <path name="speaker-hdk">
-        <path name="speaker-mono" />
-    </path>
-
-    <path name="speaker-fluid">
-        <path name="speaker-mono" />
-    </path>
-
-    <path name="speaker-liquid">
-        <path name="speaker" />
-    </path>
-
-    <path name="speaker-safe">
-        <path name="speaker-mono"/>
-    </path>
-
-    <path name="speaker-adp">
-        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->
-    </path>
-
-    <path name="speaker-custom">
-        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->
-    </path>
-
-    <path name="bus-speaker">
-        <!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->
-    </path>
-
-    <path name="bus-mic">
-        <!--ctl name="TERT_TDM_TX_0 Channels" value="Four" /-->
-    </path>
-
-   <path name="sidetone-iir">
-    </path>
-
-    <path name="sidetone-headphones">
-        <path name="sidetone-iir" />
-    </path>
-
-    <path name="sidetone-handset">
-        <path name="sidetone-iir" />
-    </path>
-
-    <path name="speaker-mic">
-        <path name="dmic3" />
-    </path>
-
-    <path name="speaker-mic-liquid">
-        <path name="dmic3" />
-    </path>
-
-    <path name="speaker-mic-sbc">
-    </path>
-
-    <path name="speaker-mic-qrd">
-        <path name="dmic1" />
-    </path>
-
-    <path name="speaker-protected">
-        <path name="speaker" />
-    </path>
-
-    <path name="speaker-protected-qrd">
-    </path>
-
-    <path name="voice-speaker-protected">
-        <path name="speaker-mono" />
-    </path>
-
-    <path name="voice-speaker-protected-qrd">
-        <path name="speaker-protected-qrd" />
-    </path>
-
-    <path name="voice-speaker-stereo-protected">
-        <path name="speaker-protected" />
-    </path>
-
-    <path name="voice-speaker-2-protected">
-        <path name="speaker-mono-2" />
-    </path>
-
-    <path name="vi-feedback">
-    </path>
-
-    <path name="vi-feedback-mono-1">
-    </path>
-
-    <path name="vi-feedback-mono-2">
-    </path>
-
-    <path name="handset">
-    </path>
-
-    <path name="handset-qrd">
-    </path>
-
-    <path name="handset-mic">
-        <path name="dmic3" />
-    </path>
-
-    <path name="handset-mic-qrd">
-        <path name="dmic3" />
-    </path>
-
-    <path name="voice-handset-mic-qrd">
-        <path name="handset-mic-qrd" />
-    </path>
-
-    <path name="handset-mic-db">
-    </path>
-
-    <path name="handset-mic-cdp">
-        <path name="amic1" />
-    </path>
-
-    <path name="handset-mic-sbc">
-    </path>
-
-    <path name="three-mic">
-    </path>
-
-    <path name="three-mic-qrd">
-    </path>
-
-    <path name="anc-handset">
-    </path>
-
-    <path name="headphones">
-    </path>
-
-    <path name="headphones-44.1">
-    </path>
-
-    <path name="asrc-mode">
-    </path>
-
-    <path name="headphones-dsd">
-    </path>
-
-    <path name="hph-highquality-mode">
-    </path>
-
-    <path name="hph-lowpower-mode">
-    </path>
-
-    <path name="true-native-mode">
-    </path>
-
-    <path name="line">
-        <path name="headphones" />
-    </path>
-
-    <path name="headset-mic">
-        <path name="amic2" />
-    </path>
-
-    <path name="headset-mic-liquid">
-        <path name="amic2" />
-    </path>
-
-    <path name="voice-handset">
-        <path name="handset" />
-    </path>
-
-    <path name="voice-handset-tmus">
-        <path name="handset" />
-    </path>
-
-    <path name="voice-handset-qrd">
-        <path name="handset-qrd" />
-    </path>
-
-    <path name="voice-handset-tmus-qrd">
-        <path name="handset-qrd" />
-    </path>
-
-    <path name="voice-handset-hdk">
-        <path name="handset-qrd" />
-    </path>
-
-    <path name="voice-handset-tmus-hdk">
-        <path name="handset-qrd" />
-    </path>
-
-    <path name="voice-speaker">
-        <path name="speaker-mono" />
-    </path>
-
-    <path name="voice-speaker-stereo">
-        <path name="speaker" />
-    </path>
-
-    <path name="voice-speaker-qrd">
-        <path name="speaker-mono-2" />
-    </path>
-
-    <path name="voice-speaker-hdk">
-        <path name="speaker-mono" />
-    </path>
-
-    <path name="voice-speaker-hfp">
-        <path name="speaker-mono" />
-    </path>
-
-    <path name="voice-speaker-2">
-        <path name="speaker-mono-2" />
-    </path>
-
-    <path name="voice-speaker-fluid">
-        <path name="speaker-fluid" />
-    </path>
-
-    <path name="voice-speaker-mic">
-        <path name="speaker-mic" />
-    </path>
-
-    <path name="voice-speaker-mic-qrd">
-        <path name="speaker-mic-qrd" />
-    </path>
-
-    <path name="voice-speaker-mic-hfp">
-        <path name="speaker-mic" />
-    </path>
-
-    <path name="voice-speaker-mic-hfp-mmsecns">
-        <path name="speaker-mic" />
-    </path>
-
-    <path name="voice-headphones">
-        <path name="headphones" />
-    </path>
-
-    <path name="voice-headset">
-        <path name="headphones" />
-    </path>
-
-    <path name="voice-line">
-        <path name="voice-headphones" />
-    </path>
-
-    <path name="voice-headset-mic">
-        <path name="amic2" />
-    </path>
-
-    <path name="voice-headset-mic-qrd">
-        <path name="amic2" />
-    </path>
-
-    <path name="speaker-and-headphones">
-        <path name="headphones" />
-        <path name="speaker" />
-    </path>
-
-    <path name="speaker-safe-and-headphones">
-        <path name="headphones" />
-        <path name="speaker-safe" />
-    </path>
-
-    <path name="speaker-and-line">
-        <path name="speaker-and-headphones" />
-    </path>
-
-    <path name="speaker-and-headphones-liquid">
-        <path name="headphones" />
-        <path name="speaker" />
-    </path>
-
-    <path name="speaker-and-line-liquid">
-        <path name="speaker-and-headphones-liquid" />
-    </path>
-
-    <path name="usb-headphones">
-    </path>
-
-    <path name="usb-headset">
-    </path>
-
-    <path name="afe-proxy">
-    </path>
-
-    <path name="anc-headphones">
-    </path>
-
-    <path name="speaker-and-anc-headphones">
-        <path name="anc-headphones" />
-        <path name="speaker" />
-    </path>
-
-    <path name="anc-fb-headphones">
-        <path name="anc-headphones" />
-    </path>
-
-    <path name="speaker-and-anc-fb-headphones">
-        <path name="anc-fb-headphones" />
-        <path name="speaker" />
-    </path>
-
-    <path name="voice-anc-headphones">
-        <path name="anc-headphones" />
-    </path>
-
-    <path name="voice-anc-fb-headphones">
-        <path name="anc-fb-headphones" />
-    </path>
-
-    <path name="speaker-and-anc-headphones-liquid">
-        <path name="anc-headphones" />
-    </path>
-
-    <path name="display-port">
-    </path>
-
-    <path name="speaker-and-usb-headphones">
-        <path name="speaker" />
-        <path name="usb-headphones" />
-    </path>
-
-    <path name="speaker-safe-and-usb-headphones">
-        <path name="speaker-safe" />
-        <path name="usb-headphones" />
-    </path>
-
-    <path name="speaker-and-display-port">
-        <path name="speaker" />
-        <path name="display-port" />
-    </path>
-
-    <path name="voice-rec-mic">
-        <path name="handset-mic" />
-    </path>
-
-    <path name="camcorder-mic">
-        <path name="handset-mic" />
-    </path>
-
-    <path name="bt-sco-headset">
-    </path>
-
-    <path name="bt-sco-mic">
-    </path>
-
-    <path name="bt-sco-headset-wb">
-    </path>
-
-    <path name="bt-sco-mic-wb">
-    </path>
-
-    <path name="usb-headset-mic">
-    </path>
-
-    <path name="capture-fm">
-    </path>
-
-    <path name="aanc-path">
-    </path>
-
-    <path name="aanc-handset-mic">
-    </path>
-
-    <path name="aanc-handset-mic-qrd">
-    </path>
-
-    <!-- Dual MIC devices -->
-    <path name="handset-dmic-endfire">
-    </path>
-
-    <path name="speaker-dmic-endfire">
-    </path>
-
-    <path name="handset-dmic-endfire-qrd">
-    </path>
-
-    <path name="speaker-dmic-endfire-qrd">
-    </path>
-
-    <path name="dmic-endfire">
-        <path name="handset-dmic-endfire" />
-    </path>
-
-    <path name="dmic-endfire-liquid">
-        <path name="handset-dmic-endfire" />
-    </path>
-
-    <path name="dmic-endfire-qrd">
-        <path name="handset-dmic-endfire-qrd" />
-    </path>
-
-    <path name="handset-stereo-dmic-ef">
-        <path name="handset-dmic-endfire" />
-    </path>
-
-    <path name="speaker-stereo-dmic-ef">
-        <path name="speaker-dmic-endfire" />
-    </path>
-
-    <path name="voice-dmic-ef-tmus">
-        <path name="dmic-endfire" />
-    </path>
-
-    <path name="voice-dmic-ef">
-        <path name="dmic-endfire" />
-    </path>
-
-    <path name="voice-speaker-dmic-ef">
-        <path name="speaker-dmic-endfire" />
-    </path>
-
-    <path name="voice-rec-dmic-ef">
-        <path name="dmic-endfire" />
-    </path>
-
-    <path name="voice-rec-dmic-ef-fluence">
-        <path name="dmic-endfire" />
-    </path>
-
-    <path name="handset-stereo-dmic-ef-liquid">
-        <path name="handset-dmic-endfire" />
-    </path>
-
-    <path name="speaker-stereo-dmic-ef-liquid">
-        <path name="speaker-dmic-endfire" />
-    </path>
-
-    <path name="voice-dmic-ef-liquid-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="voice-speaker-dmic-ef-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="voice-rec-dmic-ef-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="voice-rec-dmic-ef-fluence-liquid">
-        <path name="dmic-endfire-liquid" />
-    </path>
-
-    <path name="handset-stereo-dmic-ef-qrd">
-        <path name="handset-dmic-endfire-qrd" />
-    </path>
-
-    <path name="speaker-stereo-dmic-ef-qrd">
-        <path name="speaker-dmic-endfire-qrd" />
-    </path>
-
-    <path name="voice-dmic-ef-qrd">
-        <path name="dmic-endfire-qrd" />
-    </path>
-
-    <path name="voice-speaker-dmic-ef-qrd">
-        <path name="speaker-dmic-endfire-qrd" />
-    </path>
-
-    <path name="speaker-dmic-broadside">
-    </path>
-
-    <path name="dmic-broadside">
-        <path name="speaker-dmic-broadside" />
-    </path>
-
-    <path name="voice-speaker-dmic-broadside">
-        <path name="dmic-broadside" />
-    </path>
-
-    <path name="voice-speaker-dmic-broadside-qrd">
-        <path name="speaker-dmic-broadside-qrd" />
-    </path>
-
-    <!-- Tri MIC devices -->
-    <path name="speaker-tmic">
-    </path>
-
-    <path name="speaker-tmic-qrd">
-    </path>
-
-    <path name="voice-speaker-tmic">
-        <path name="speaker-tmic" />
-    </path>
-
-    <path name="voice-speaker-tmic-qrd">
-        <path name="speaker-tmic-qrd" />
-    </path>
-
-    <!-- Quad MIC devices -->
-    <path name="speaker-qmic">
-        <ctl name="TERT_TDM_TX_0 Channels" value="Four" />
-        <ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-    <path name="speaker-qmic-qrd">
-    </path>
-
-    <path name="speaker-qmic-liquid">
-    </path>
-
-    <path name="voice-speaker-qmic">
-        <path name="speaker-qmic" />
-    </path>
-
-    <path name="quad-mic">
-        <path name="speaker-qmic" />
-    </path>
-
-    <path name="voice-speaker-qmic-liquid">
-        <path name="speaker-qmic-liquid" />
-    </path>
-
-    <path name="quad-mic-liquid">
-        <path name="speaker-qmic-liquid" />
-    </path>
-
-    <path name="quad-mic-qrd">
-        <path name="speaker-qmic-qrd" />
-    </path>
-
-    <path name="voice-speaker-qmic-qrd">
-        <path name="speaker-qmic-qrd" />
-    </path>
-
-    <!-- TTY devices -->
-
-    <path name="tty-headphones">
-    </path>
-
-    <path name="voice-tty-full-headset-mic">
-        <path name="amic2" />
-    </path>
-
-    <path name="voice-tty-hco-headset-mic">
-    </path>
-
-    <path name="voice-tty-vco-handset-mic">
-        <path name="dmic1" />
-    </path>
-
-    <path name="unprocessed-handset-mic">
-        <path name="handset-mic" />
-    </path>
-
-    <path name="unprocessed-mic">
-        <path name="unprocessed-handset-mic" />
-    </path>
-
-    <path name="unprocessed-stereo-mic">
-        <path name="voice-rec-dmic-ef" />
-    </path>
-
-    <path name="unprocessed-three-mic">
-        <path name="three-mic" />
-    </path>
-
-    <path name="unprocessed-quad-mic">
-        <path name="quad-mic" />
-    </path>
-
-    <path name="unprocessed-headset-mic">
-        <path name="amic2" />
-    </path>
-
-    <!-- USB TTY start -->
-
-    <!-- full: both end tty -->
-
-    <path name="voice-tty-full-usb-mic">
-        <path name="usb-headset-mic" />
-    </path>
-
-    <!-- hco, in: tty, out: speaker, use existing handset -->
-    <path name="voice-tty-hco-usb-mic">
-        <path name="voice-tty-full-usb-mic" />
-    </path>
-
-    <!-- USB TTY end   -->
-
-    <!-- Added for ADSP testfwk -->
-
-    <path name="mmap-playback">
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="mmap-playback sys-bus-out">
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="mmap-playback nav-bus-out">
-        <ctl name="TERT_TDM_RX_1 Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="mmap-playback phone-bus-out">
-        <ctl name="TERT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="mmap-playback pax-bus-out">
-        <ctl name="QUAT_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="mmap-playback rse-bus-out">
-        <ctl name="QUIN_TDM_RX_0 Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="mmap-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia16" value="1" />
-    </path>
-
-    <path name="hifi-playback afe-proxy">
-        <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="1" />
-    </path>
-
-    <path name="mmap-record">
-        <ctl name="MultiMedia16 Mixer TERT_TDM_TX_0" value="1" />
-    </path>
-
-</mixer>
diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 67dc372..2f6824e 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -160,6 +160,7 @@
 DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/overlay
 
 PRODUCT_COPY_FILES += \
+    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \
     vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
     vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \
     vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
@@ -187,6 +188,7 @@
     $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml
 endif
 PRODUCT_COPY_FILES += \
+    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
     $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
     $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
@@ -195,16 +197,6 @@
     $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \
     $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/car_audio_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/car_audio_configuration.xml
 
-ifeq ($(AUDIO_FEATURE_MMAP_AAUDIO), true)
-PRODUCT_COPY_FILES += \
-    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/audio_policy_mmap_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_mmap_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml
-else
-PRODUCT_COPY_FILES += \
-    vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \
-    $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/common_au/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml
-endif
-
 # Listen configuration file
 PRODUCT_COPY_FILES += \
     vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml