summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2020-01-30 16:27:54 +0800
committerMichael Bestas <mkbestas@lineageos.org>2020-04-30 00:48:54 +0300
commitb5277eaedeb081e8799dc556ea45e6f509d619d0 (patch)
treed7ec893ffda112ebe73ad1d8861ece4c39ba52df
parent441640fe75d07aeffb7c5a925848f3d38bf88a49 (diff)
sdm660-common: Decommonize sound_trigger_mixer_paths.xml
Change-Id: I814306d7ebbeed9b6c57cd3bef02c8a7a16ba0ff
-rw-r--r--audio/sound_trigger_mixer_paths.xml178
-rw-r--r--sdm660.mk1
2 files changed, 0 insertions, 179 deletions
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml
deleted file mode 100644
index 7619e26..0000000
--- a/audio/sound_trigger_mixer_paths.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--- Copyright (c) 2014-2017, 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, -->
-<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -->
-<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
-<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
-
-<mixer>
- <!-- These are the initial mixer settings -->
- <ctl name="LSM1 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM2 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM3 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM4 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM5 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM6 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM7 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM8 Mixer INT3_MI2S_TX" value="0" />
- <ctl name="LSM1 Port" value="None" />
- <ctl name="LSM2 Port" value="None" />
- <ctl name="LSM3 Port" value="None" />
- <ctl name="LSM4 Port" value="None" />
- <ctl name="LSM5 Port" value="None" />
- <ctl name="LSM6 Port" value="None" />
- <ctl name="LSM7 Port" value="None" />
- <ctl name="LSM8 Port" value="None" />
- <ctl name="INT3_MI2S_TX LSM Function" value="None" />
- <ctl name="DEC1 MUX" value="ZERO" />
- <ctl name="DEC2 MUX" value="ZERO" />
- <ctl name="DEC3 MUX" value="ZERO" />
- <ctl name="DEC4 MUX" value="ZERO" />
- <ctl name="I2S TX2 INP1" value="ZERO" />
- <ctl name="I2S TX2 INP2" value="ZERO" />
-
- <path name="listen-voice-wakeup-1">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM1 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM1 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-2">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM2 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM2 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-3">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM3 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM3 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-4">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM4 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM4 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-5">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM5 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM5 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-6">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM6 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM6 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-7">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM7 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM7 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-8">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM8 Port" value="INT3_MI2S_TX" />
- <ctl name="LSM8 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-1 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM1 Port" value="ADM_LSM_TX" />
- <ctl name="LSM1 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-2 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM2 Port" value="ADM_LSM_TX" />
- <ctl name="LSM2 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-3 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM3 Port" value="ADM_LSM_TX" />
- <ctl name="LSM3 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-4 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM4 Port" value="ADM_LSM_TX" />
- <ctl name="LSM4 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-5 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM5 Port" value="ADM_LSM_TX" />
- <ctl name="LSM5 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-6 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM6 Port" value="ADM_LSM_TX" />
- <ctl name="LSM6 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-7 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM7 Port" value="ADM_LSM_TX" />
- <ctl name="LSM7 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-voice-wakeup-8 preproc">
- <ctl name="INT3_MI2S_TX LSM Function" value="SWAUDIO" />
- <ctl name="LSM8 Port" value="ADM_LSM_TX" />
- <ctl name="LSM8 Mixer INT3_MI2S_TX" value="1" />
- </path>
-
- <path name="listen-ape-handset-mic">
- <ctl name="DEC1 Volume" value="84" />
- <ctl name="DEC1 MUX" value="DMIC3" />
- </path>
-
- <path name="listen-ape-handset-mic-preproc">
- <path name="listen-ape-handset-mic"/>
- </path>
-
- <path name="listen-ape-handset-qmic">
- <ctl name="INT3_MI2S_TX Channels" value="Four" />
- <ctl name="DEC1 MUX" value="DMIC2" />
- <ctl name="DEC2 MUX" value="DMIC1" />
- <ctl name="DEC3 MUX" value="DMIC3" />
- <ctl name="I2S TX2 INP1" value="DEC3" />
- <ctl name="DEC4 MUX" value="DMIC4" />
- <ctl name="I2S TX2 INP2" value="DEC4" />
- </path>
-
- <path name="echo-reference">
- <ctl name="AUDIO_REF_EC_UL1 MUX" value="INT4_MI2S_RX"/>
- <ctl name="EC Reference Channels" value="Two"/>
- <ctl name="EC Reference Bit Format" value="S16_LE"/>
- <ctl name="EC Reference SampleRate" value="48000"/>
- </path>
-
-
-</mixer>
diff --git a/sdm660.mk b/sdm660.mk
index e6f7a42..4597d5b 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -109,7 +109,6 @@ PRODUCT_COPY_FILES += \
$(COMMON_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
$(COMMON_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \
$(COMMON_PATH)/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml \
- $(COMMON_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
$(COMMON_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
$(COMMON_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
$(COMMON_PATH)/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml