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

Commit 7216b246 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "config: Add new mixer paths and platform info for ICC"

parents 137b1629 0a861c4b

configs/msmnile_au/audio_platform_info.xml

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_ICC" acdb_id="16"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="11"/>

        <device name="SND_DEVICE_IN_BUS" acdb_id="11"/>
@@ -59,6 +60,7 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" acdb_id="47"/>

        <device name="SND_DEVICE_IN_ICC" acdb_id="46"/>

    </acdb_ids>



    <module_ids>
@@ -131,6 +133,8 @@ 
        <usecase name="USECASE_AUDIO_HFP_SCO_DOWNLINK" type="out" id="36" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="in" id="36" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="out" id="36" />

        <usecase name="USECASE_ICC_CALL" type="in" id="33" />

        <usecase name="USECASE_ICC_CALL" type="out" id="33" />

    </pcm_ids>



    <config_params>
@@ -175,6 +179,7 @@ 
        <device name="SND_DEVICE_OUT_BUS_PHN" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BUS_PAX" interface="QUAT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_BUS_RSE" interface="QUIN_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_ICC" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC" interface="TERT_TDM_TX_0"/>
@@ -190,6 +195,7 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_ICC" interface="TERT_TDM_TX_0"/>

        <!-- multi-mic surround ECNS mixer path definition -->

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" backend="bt-sco-mmsecns" interface="TERT_TDM_TX_0"/>

    </backend_names>

configs/msmnile_au/mixer_paths_adp.xml

+2 −3
Original line number Diff line number Diff line
@@ -1607,9 +1607,8 @@ 
    </path>



    <path name="icc-call">

        <ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />

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

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

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

configs/msmnile_au/mixer_paths_custom.xml

+2 −3
Original line number Diff line number Diff line
@@ -1595,9 +1595,8 @@ 
    </path>



    <path name="icc-call">

        <ctl name="SEC_TDM_RX_0 SampleRate" value="KHZ_16" />

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

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

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

configs/msmnile_au/msmnile_au.mk

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ ifneq ($(ENABLE_HYP),true) 
AUDIO_FEATURE_ENABLED_AUTO_AUDIOD := true

endif

AUDIO_FEATURE_ENABLED_FM_TUNER_EXT := true

AUDIO_FEATURE_ENABLED_ICC := true

##AUTOMOTIVE_AUDIO_FEATURE_FLAGS



ifneq ($(strip $(TARGET_USES_RRO)), true)
@@ -360,6 +361,7 @@ vendor.audio.feature.fm.enable=false \ 
vendor.audio.feature.hdmi_edid.enable=false \

vendor.audio.feature.hdmi_passthrough.enable=false \

vendor.audio.feature.hfp.enable=true  \

vendor.audio.feature.icc.enable=true  \

vendor.audio.feature.hifi_audio.enable=false \

vendor.audio.feature.hwdep_cal.enable=false  \

vendor.audio.feature.incall_music.enable=true  \
@@ -405,6 +407,7 @@ vendor.audio.feature.fm.enable=true \ 
vendor.audio.feature.hdmi_edid.enable=true \

vendor.audio.feature.hdmi_passthrough.enable=true \

vendor.audio.feature.hfp.enable=true \

vendor.audio.feature.icc.enable=true \

vendor.audio.feature.hifi_audio.enable=false \

vendor.audio.feature.hwdep_cal.enable=false \

vendor.audio.feature.incall_music.enable=true \

configs/msmsteppe_au/audio_platform_info.xml

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_HFP" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_STEREO" acdb_id="94"/>

        <device name="SND_DEVICE_OUT_ICC" acdb_id="16"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="11"/>

        <device name="SND_DEVICE_IN_BUS" acdb_id="11"/>
@@ -59,6 +60,7 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="80"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" acdb_id="47"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" acdb_id="47"/>

        <device name="SND_DEVICE_IN_ICC" acdb_id="46"/>

    </acdb_ids>



    <module_ids>
@@ -131,6 +133,8 @@ 
        <usecase name="USECASE_AUDIO_HFP_SCO_DOWNLINK" type="out" id="36" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="in" id="36" />

        <usecase name="USECASE_AUDIO_HFP_SCO_WB_DOWNLINK" type="out" id="36" />

        <usecase name="USECASE_ICC_CALL" type="in" id="33" />

        <usecase name="USECASE_ICC_CALL" type="out" id="33" />

    </pcm_ids>



    <config_params>
@@ -175,6 +179,7 @@ 
        <device name="SND_DEVICE_OUT_BUS_PHN" interface="TERT_TDM_RX_2"/>

        <device name="SND_DEVICE_OUT_BUS_PAX" interface="QUAT_TDM_RX_0"/>

        <device name="SND_DEVICE_OUT_BUS_RSE" interface="QUAT_TDM_RX_1"/>

        <device name="SND_DEVICE_OUT_ICC" interface="TERT_TDM_RX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HEADSET_MIC" interface="TERT_TDM_TX_0"/>
@@ -190,6 +195,7 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_HANDSET_QMIC" interface="TERT_TDM_TX_0"/>

        <device name="SND_DEVICE_IN_ICC" interface="TERT_TDM_TX_0"/>

        <!-- multi-mic surround ECNS mixer path definition -->

        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP_MMSECNS" backend="bt-sco-mmsecns" interface="TERT_TDM_TX_0"/>

    </backend_names>