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

Commit 32b7a1b2 authored by Bruno Martins's avatar Bruno Martins
Browse files

Merge tag 'LA.UM.9.14.r1-23600-LAHAINA.QSSI14.0' of... 

Merge tag 'LA.UM.9.14.r1-23600-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio into lineage-21.0-caf-sm8350

"LA.UM.9.14.r1-23600-LAHAINA.QSSI14.0"

* tag 'LA.UM.9.14.r1-23600-LAHAINA.QSSI14.0' of https://git.codelinaro.org/clo/la/platform/hardware/qcom/audio:
  audio-HAL: Fix for KW static analysis issues
  audiohal: fix right audio platform xml file for rb3 gen2
  Removed not used audio properties from audio-hal.
  audio-hal: Fix kw issue
  hal: add support for hfp on qcs6490
  configs: rb3gen2: add support for HDMI out on rb3gen2 platform
  hal: add support of HDMI external display for rb3gen2
  hal: Extract source track meta data for 2mic
  configs: rb3gen2: add support for 2/3/4 mic on rb3gen2 platform
  hal: update mixer path files for Rb3Gen2 IOT with FV13 tuning
  configs: RB3Gen2: add support for dual mic on RB3Gen2 platform.
  hal: add support for rb3gen2 specific mixer xml
  audio-hal: modify out_set_mmap_volume sequence
  configs: msmsteppe_au: Update audio hal to 7.0
  msmnile-tb bringup change.
  config: 64bit suppor for msmsteppe auto

Change-Id: Ib536a3c77ee22d4d3f0a922f7a45c3b4b3734311
parents 38a54430 aeb79f08

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/bengal/bengal.mk

+1 −8
Original line number Diff line number Diff line
@@ -235,10 +235,7 @@ ro.qc.sdk.audio.ssr=false 


##fluencetype can be "fluence" or "fluencepro" or "none"

PRODUCT_VENDOR_PROPERTIES += \

ro.qc.sdk.audio.fluencetype=none\

persist.audio.fluence.voicecall=true\

persist.audio.fluence.voicerec=false\

persist.audio.fluence.speaker=true

ro.qc.sdk.audio.fluencetype=none



#disable tunnel encoding

PRODUCT_VENDOR_PROPERTIES += \
@@ -347,10 +344,6 @@ vendor.audio.adm.buffering.ms=2 
#enable headset calibration

PRODUCT_VENDOR_PROPERTIES += \

vendor.audio.volume.headset.gain.depcal=true



#enable dualmic fluence for voice communication

PRODUCT_VENDOR_PROPERTIES += \

persist.vendor.audio.fluence.voicecomm=true

endif



USE_XML_AUDIO_POLICY_CONF := 1

configs/lahaina/lahaina.mk

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


OVERLAY_PATH := $(AUDIO_HAL_DIR)/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
@@ -261,8 +261,10 @@ PRODUCT_COPY_FILES += \ 
    $(AUDIO_HAL_DIR)/configs/lahaina/audio_platform_info_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_yupikqrd.xml \

    $(AUDIO_HAL_DIR)/configs/lahaina/audio_platform_info_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/audio_platform_info_yupikidp.xml \

    $(AUDIO_HAL_DIR)/configs/lahaina/sound_trigger_mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidp.xml \

    $(AUDIO_HAL_DIR)/configs/lahaina/sound_trigger_mixer_paths_yupikidprb3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikidprb3.xml \

    $(AUDIO_HAL_DIR)/configs/lahaina/sound_trigger_mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/sound_trigger_mixer_paths_yupikqrd.xml \

    $(AUDIO_HAL_DIR)/configs/lahaina/mixer_paths_yupikidp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikidp.xml \

    $(AUDIO_HAL_DIR)/configs/lahaina/mixer_paths_yupikidprb3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikidprb3.xml \

    $(AUDIO_HAL_DIR)/configs/lahaina/mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_$(DEVICE_SKU)/mixer_paths_yupikqrd.xml \

    $(AUDIO_HAL_DIR)/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
+237 −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" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia2" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia7" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia8" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia9" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia10" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia11" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia12" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia13" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia14" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia16" value="0" />



    <path name="hdmi">

	<ctl name="SEC_MI2S_RX Format" value="S32_LE" />

    </path>

    <path name="low-latency-playback hdmi">

        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="1" />

    </path>

    <path name="compress-offload-playback hdmi">

        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="1" />

    </path>

    <path name="compress-offload-playback2 hdmi">

        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia7" value="1" />

    </path>

    <path name="compress-offload-playback3 hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia10" value="1" />

    </path>

    <path name="compress-offload-playback4 hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia11" value="1" />

    </path>

    <path name="compress-offload-playback5 hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia12" value="1" />

    </path>

    <path name="compress-offload-playback6 hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia13" value="1" />

    </path>

    <path name="compress-offload-playback7 hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia14" value="1" />

    </path>

    <path name="compress-offload-playback8 hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia15" value="1" />

    </path>

    <path name="compress-offload-playback9 hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia16" value="1" />

    </path>

    <path name="mmap-playback hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia16" value="1" />

    </path>

    <path name="audio-playback-voip hdmi">

        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia10" value="1" />

    </path>

    <path name="audio-ull-playback hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia8" value="1" />

    </path>

    <path name="deep-buffer-playback hdmi">

        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia1" value="1" />

    </path>

    <path name="silence-playback hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia9" value="1" />

    </path>

    <path name="hifi-playback hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia2" value="1" />

    </path>

    <path name="multi-channel-playback hdmi">

	<ctl name="SEC_MI2S_RX Audio Mixer MultiMedia2" value="1" />

    </path>

    <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>