Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c250d47d authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge f47d1f2e on remote branch 

Change-Id: I60fe59f14ceefcbab6f3db12248a60ed6f92e027
parents 2aac4910 f47d1f2e

configs/audio_vendor_product.mk

+2 −0
Original line number Diff line number Diff line
@@ -241,6 +241,8 @@ ifeq ($(TARGET_GVMGH_SPECIFIC), false) 
-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/msmnile_au.mk

else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX),msmnile_au_km4)

-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/msmnile_au.mk

else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX),msmnile_tb)

-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/msmnile_au.mk

else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX)$(TARGET_BOARD_DERIVATIVE_SUFFIX),msmnile_au_ar)

-include $(TOPDIR)vendor/qcom/opensource/audio-hal/primary-hal/configs/msmnile_au/msmnile_au.mk

else ifeq ($(TARGET_BOARD_PLATFORM)$(TARGET_BOARD_SUFFIX),sm6150_au)

configs/lahaina/lahaina.mk

+4 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ $(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/sound_trigger_mi 


OVERLAY_PATH := vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/yupik_overlay



$(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/mixer_paths_base.xml --overlay $(OVERLAY_PATH)/mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/mixer_paths_yupikqrd_overlay.xml --out_dir $(TARGET_PATH) --out mixer_paths_yupikidp.xml mixer_paths_yupikqrd.xml )

$(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/mixer_paths_base.xml --overlay $(OVERLAY_PATH)/mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/mixer_paths_yupikqrd_overlay.xml $(OVERLAY_PATH)/mixer_paths_yupikidprb3_overlay.xml --out_dir $(TARGET_PATH) --out mixer_paths_yupikidp.xml mixer_paths_yupikqrd.xml mixer_paths_yupikidprb3.xml)



$(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/sound_trigger_mixer_paths_base.xml --overlay $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikqrd_overlay.xml --out_dir $(TARGET_PATH) --out sound_trigger_mixer_paths_yupikidp.xml sound_trigger_mixer_paths_yupikqrd.xml )

$(shell python $(SCRIPT) --generate combine --base $(BASE_PATH)/sound_trigger_mixer_paths_base.xml --overlay $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikidp_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikqrd_overlay.xml $(OVERLAY_PATH)/sound_trigger_mixer_paths_yupikidprb3_overlay.xml --out_dir $(TARGET_PATH) --out sound_trigger_mixer_paths_yupikidp.xml sound_trigger_mixer_paths_yupikqrd.xml sound_trigger_mixer_paths_yupikidprb3.xml)

#

ifneq ($(AUDIO_USE_STUB_HAL), true)

BOARD_USES_ALSA_AUDIO := true
@@ -259,8 +259,10 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_yupikqrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_platform_info_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_yupikidp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikidprb3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidprb3.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/sound_trigger_mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikqrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikidp.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_yupikidprb3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikidprb3.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikqrd.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/lahaina/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_tuning_mixer.txt \

    frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/default_volume_tables.xml \

configs/lahaina/yupik_overlay/mixer_paths_yupikidp_overlay.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
        <path name="dmic4"/>

    </path>

    <path name="handset-mic">

        <path name="dmic3"/>

        <path name="dmic1"/>

    </path>

    <path name="handset-dmic-endfire">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>

configs/lahaina/yupik_overlay/mixer_paths_yupikidprb3_overlay.xml

0 → 100644
+169 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--- Copyright (c) 2020-2021, 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.                             -->

<!--                                                                        -->

<!-- Changes from Qualcomm Innovation Center are provided under the following license:-->

<!-- Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- SPDX-License-Identifier: BSD-3-Clause-Clear                            -->

<mixer>

    <ctl name="TX DEC0 MUX" value="MSM_DMIC"/>

    <ctl name="TX DEC1 MUX" value="MSM_DMIC"/>

    <ctl name="TX DEC2 MUX" value="MSM_DMIC"/>

    <ctl name="TX DEC3 MUX" value="MSM_DMIC"/>

    <ctl name="TX DEC4 MUX" value="MSM_DMIC"/>

    <ctl name="TX DEC5 MUX" value="MSM_DMIC"/>

    <ctl name="TX DEC6 MUX" value="MSM_DMIC"/>

    <ctl name="TX DEC7 MUX" value="MSM_DMIC"/>

    <ctl name="MultiMedia1 Mixer SEC_MI2S_TX" value="0"/>

    <ctl name="MultiMedia2 Mixer SEC_MI2S_TX" value="0"/>

    <ctl name="MultiMedia8 Mixer SEC_MI2S_TX" value="0"/>

    <ctl name="MultiMedia16 Mixer SEC_MI2S_TX" value="0"/>

    <ctl name="SEC MI2S LOOPBACK Volume" value="0"/>

    <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SEC_MI2S_TX" value="0"/>

    <ctl name="MultiMedia1 Mixer PRI_MI2S_TX" value="0" />

    <ctl name="MultiMedia17 Mixer PRI_MI2S_TX" value="0" />



    <path name="audio-record hdmi-in">

	<ctl name="MultiMedia1 Mixer PRI_MI2S_TX" value="1" />

    </path>

    <path name="hdmi-in">

    </path>

    <path name="audio-record-compress2 hdmi-in">

	<ctl name="MultiMedia17 Mixer PRI_MI2S_TX" value="1" />

    </path>

    <path name="speaker-mic">

        <path name="dmic4"/>

    </path>

    <path name="speaker-mic-liquid">

        <path name="dmic4"/>

    </path>

    <path name="handset-mic">

        <path name="dmic6"/>

    </path>

    <path name="handset-dmic-endfire">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="TX DMIC MUX1" value="DMIC2"/>

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>

        <ctl name="TX DMIC MUX2" value="DMIC3"/>

    </path>

    <path name="speaker-dmic-endfire">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="TX DMIC MUX1" value="DMIC3"/>

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>

        <ctl name="TX DMIC MUX2" value="DMIC1"/>

    </path>

    <path name="speaker-dmic-broadside">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two"/>

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="TX DMIC MUX1" value="DMIC3"/>

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>

        <ctl name="TX DMIC MUX2" value="DMIC0"/>

    </path>

    <path name="three-mic">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three"/>

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="TX DMIC MUX1" value="DMIC3"/>

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>

        <ctl name="TX DMIC MUX2" value="DMIC0"/>

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>

        <ctl name="TX DMIC MUX3" value="DMIC2"/>

    </path>

    <path name="speaker-tmic">

        <path name="three-mic" />

    </path>

    <path name="speaker-qmic">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Four"/>

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="TX DMIC MUX1" value="DMIC3"/>

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1"/>

        <ctl name="TX DMIC MUX2" value="DMIC0"/>

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1"/>

        <ctl name="TX DMIC MUX3" value="DMIC2"/>

        <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>

        <ctl name="TX DMIC MUX4" value="DMIC1"/>

    </path>

    <path name="dmic-nn">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC5" />

        <ctl name="TX_DEC1 Volume" value="104" />

        <ctl name="TX_DEC2 Volume" value="104" />

    </path>

    <path name="three-mic-nn">

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC4" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC5" />

        <ctl name="TX_DEC1 Volume" value="104" />

        <ctl name="TX_DEC2 Volume" value="104" />

        <ctl name="TX_DEC3 Volume" value="104" />

    </path>

    <path name="voice-tty-vco-handset-mic">

        <path name="dmic1"/>

    </path>

    <path name="audio-record capture-fm">

        <ctl name="MultiMedia1 Mixer SEC_MI2S_TX" value="1"/>

    </path>

    <path name="low-latency-record capture-fm">

        <ctl name="MultiMedia8 Mixer SEC_MI2S_TX" value="1"/>

    </path>

    <path name="fm-virtual-record capture-fm">

        <ctl name="MultiMedia2 Mixer SEC_MI2S_TX" value="1"/>

    </path>

    <path name="play-fm">

        <ctl name="SEC MI2S LOOPBACK Volume" value="1"/>

        <ctl name="WSA_CDC_DMA_RX_0 Port Mixer SEC_MI2S_TX" value="1"/>

        <ctl name="WSA_CDC_DMA_RX_0_DL_HL Switch" value="1"/>

    </path>

    <path name="play-fm headphones">

        <ctl name="SEC MI2S LOOPBACK Volume" value="1"/>

        <ctl name="RX_CDC_DMA_RX_0 Port Mixer SEC_MI2S_TX" value="1"/>

        <ctl name="RX_CDC_DMA_RX_0_DL_HL Switch" value="1"/>

    </path>

    <path name="mmap-record capture-fm">

        <ctl name="MultiMedia16 Mixer SEC_MI2S_TX" value="1"/>

    </path>

    <path name="echo-reference usb-headphones">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="USB_AUDIO_RX"/>

        <ctl name="EC Reference Channels" value="Two"/>

    </path>

    <path name="echo-reference-voip-low-latency usb-headphones">

        <ctl name="AUDIO_REF_EC_UL8 MUX" value="USB_AUDIO_RX"/>

        <ctl name="EC Reference Channels" value="Two"/>

    </path>

    <path name="echo-reference-voip usb-headphones">

        <ctl name="AUDIO_REF_EC_UL10 MUX" value="USB_AUDIO_RX"/>

        <ctl name="EC Reference Channels" value="Two"/>

    </path>

</mixer>

configs/lahaina/yupik_overlay/sound_trigger_mixer_paths_yupikidprb3_overlay.xml

0 → 100644
+83 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--- Copyright (c) 2020-2021, 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.                             -->

<!--                                                                        -->

<!-- Changes from Qualcomm Innovation Center are provided under the following license:-->

<!-- Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- SPDX-License-Identifier: BSD-3-Clause-Clear                            -->

<mixer>

    <ctl name="VA DEC0 MUX" value="MSM_DMIC"/>

    <ctl name="VA DEC1 MUX" value="MSM_DMIC"/>

    <ctl name="VA DEC2 MUX" value="MSM_DMIC"/>

    <ctl name="VA DEC3 MUX" value="MSM_DMIC"/>

    <ctl name="VA DEC4 MUX" value="MSM_DMIC"/>

    <ctl name="VA DEC5 MUX" value="MSM_DMIC"/>

    <ctl name="VA DEC6 MUX" value="MSM_DMIC"/>

    <ctl name="VA DEC7 MUX" value="MSM_DMIC"/>

    <path name="listen-ape-handset-mic">

        <ctl name="VA_CDC_DMA_TX_0 Channels" value="One"/>

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/>

        <ctl name="VA DEC0 MUX" value="MSM_DMIC"/>

        <ctl name="VA DMIC MUX0" value="DMIC3"/>

    </path>

    <path name="listen-ape-handset-dmic">

        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Two"/>

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/>

        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="VA DEC0 MUX" value="MSM_DMIC"/>

        <ctl name="VA DEC1 MUX" value="MSM_DMIC"/>

        <ctl name="VA DMIC MUX0" value="DMIC3"/>

        <ctl name="VA DMIC MUX1" value="DMIC5"/>

    </path>

    <path name="listen-ape-handset-tmic">

        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Three"/>

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/>

        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1"/>

        <ctl name="VA DEC0 MUX" value="MSM_DMIC"/>

        <ctl name="VA DEC1 MUX" value="MSM_DMIC"/>

        <ctl name="VA DEC2 MUX" value="MSM_DMIC"/>

        <ctl name="VA DMIC MUX0" value="DMIC3"/>

        <ctl name="VA DMIC MUX1" value="DMIC4"/>

        <ctl name="VA DMIC MUX2" value="DMIC2"/>

    </path>

    <path name="listen-ape-handset-qmic">

        <ctl name="VA_CDC_DMA_TX_0 Channels" value="Four"/>

        <ctl name="VA_AIF1_CAP Mixer DEC0" value="1"/>

        <ctl name="VA_AIF1_CAP Mixer DEC1" value="1"/>

        <ctl name="VA_AIF1_CAP Mixer DEC2" value="1"/>

        <ctl name="VA_AIF1_CAP Mixer DEC3" value="1"/>

        <ctl name="VA DEC0 MUX" value="MSM_DMIC"/>

        <ctl name="VA DEC1 MUX" value="MSM_DMIC"/>

        <ctl name="VA DEC2 MUX" value="MSM_DMIC"/>

        <ctl name="VA DEC3 MUX" value="MSM_DMIC"/>

        <ctl name="VA DMIC MUX0" value="DMIC3"/>

        <ctl name="VA DMIC MUX1" value="DMIC4"/>

        <ctl name="VA DMIC MUX2" value="DMIC2"/>

        <ctl name="VA DMIC MUX3" value="DMIC5"/>

    </path>

</mixer>