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

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

Merge "configs: kona: add support for bt-sco-swb"

parents 0bd32d0a d2f92b49

configs/kona/audio_platform_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="29" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="29" />

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

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

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

    </pcm_ids>

    <config_params>

configs/kona/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="29" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="29" />

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

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

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

    </pcm_ids>

    <config_params>

configs/kona/audio_platform_info_qrd.xml

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
        <usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="29" />

        <usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="29" />

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

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

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="23" />

    </pcm_ids>

    <config_params>

configs/kona/mixer_paths.xml

+182 −0
Original line number Diff line number Diff line
@@ -482,6 +482,10 @@ 
        <path name="deep-buffer-playback bt-sco" />

    </path>



    <path name="deep-buffer-playback bt-sco-swb">

        <path name="deep-buffer-playback bt-sco" />

    </path>



    <path name="deep-buffer-playback afe-proxy">

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

    </path>
@@ -518,6 +522,11 @@ 
        <path name="deep-buffer-playback" />

    </path>



    <path name="deep-buffer-playback speaker-and-bt-sco-swb">

        <path name="deep-buffer-playback bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -539,6 +548,10 @@ 
        <path name="low-latency-playback bt-sco" />

    </path>



    <path name="low-latency-playback bt-sco-swb">

        <path name="low-latency-playback bt-sco" />

    </path>



    <path name="low-latency-playback speaker-and-display-port">

        <path name="low-latency-playback display-port" />

        <path name="low-latency-playback" />
@@ -583,6 +596,11 @@ 
        <path name="low-latency-playback" />

    </path>



    <path name="low-latency-playback speaker-and-bt-sco-swb">

        <path name="low-latency-playback bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -613,6 +631,10 @@ 
        <path name="audio-ull-playback bt-sco" />

    </path>



    <path name="audio-ull-playback bt-sco-swb">

        <path name="audio-ull-playback bt-sco" />

    </path>



    <path name="audio-ull-playback speaker-and-display-port">

        <path name="audio-ull-playback display-port" />

        <path name="audio-ull-playback" />
@@ -640,6 +662,11 @@ 
        <path name="audio-ull-playback" />

    </path>



    <path name="audio-ull-playback speaker-and-bt-sco-swb">

        <path name="audio-ull-playback bt-sco-swb" />

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

    </path>



    <path name="multi-channel-playback display-port">

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

    </path>
@@ -673,6 +700,10 @@ 
        <path name="compress-offload-playback bt-sco" />

    </path>



    <path name="compress-offload-playback bt-sco-swb">

        <path name="compress-offload-playback bt-sco" />

    </path>



    <path name="compress-offload-playback speaker-and-display-port">

        <path name="compress-offload-playback display-port" />

        <path name="compress-offload-playback" />
@@ -722,6 +753,11 @@ 
        <path name="compress-offload-playback" />

    </path>



    <path name="compress-offload-playback speaker-and-bt-sco-swb">

        <path name="compress-offload-playback bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -739,6 +775,10 @@ 
        <path name="compress-offload-playback2 bt-sco" />

    </path>



    <path name="compress-offload-playback2 bt-sco-swb">

        <path name="compress-offload-playback2 bt-sco" />

    </path>



    <path name="compress-offload-playback2 speaker-and-display-port">

        <path name="compress-offload-playback2 display-port" />

        <path name="compress-offload-playback2" />
@@ -789,6 +829,11 @@ 
        <path name="compress-offload-playback2" />

    </path>



    <path name="compress-offload-playback2 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback2 bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -806,6 +851,10 @@ 
        <path name="compress-offload-playback3 bt-sco" />

    </path>



    <path name="compress-offload-playback3 bt-sco-swb">

        <path name="compress-offload-playback3 bt-sco" />

    </path>



    <path name="compress-offload-playback3 speaker-and-display-port">

        <path name="compress-offload-playback3 display-port" />

        <path name="compress-offload-playback3" />
@@ -855,6 +904,11 @@ 
        <path name="compress-offload-playback3" />

    </path>



    <path name="compress-offload-playback3 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback3 bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -872,6 +926,10 @@ 
        <path name="compress-offload-playback4 bt-sco" />

    </path>



    <path name="compress-offload-playback4 bt-sco-swb">

        <path name="compress-offload-playback4 bt-sco" />

    </path>



    <path name="compress-offload-playback4 speaker-and-display-port">

        <path name="compress-offload-playback4 display-port" />

        <path name="compress-offload-playback4" />
@@ -922,6 +980,11 @@ 
        <path name="compress-offload-playback4" />

    </path>



    <path name="compress-offload-playback4 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback4 bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -939,6 +1002,10 @@ 
        <path name="compress-offload-playback5 bt-sco" />

    </path>



    <path name="compress-offload-playback5 bt-sco-swb">

        <path name="compress-offload-playback5 bt-sco" />

    </path>



    <path name="compress-offload-playback5 speaker-and-display-port">

        <path name="compress-offload-playback5 display-port" />

        <path name="compress-offload-playback5" />
@@ -988,6 +1055,11 @@ 
        <path name="compress-offload-playback5" />

    </path>



    <path name="compress-offload-playback5 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback5 bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -1005,6 +1077,10 @@ 
        <path name="compress-offload-playback6 bt-sco" />

    </path>



    <path name="compress-offload-playback6 bt-sco-swb">

        <path name="compress-offload-playback6 bt-sco" />

    </path>



    <path name="compress-offload-playback6 speaker-and-display-port">

        <path name="compress-offload-playback6 display-port" />

        <path name="compress-offload-playback6" />
@@ -1054,6 +1130,11 @@ 
        <path name="compress-offload-playback6" />

    </path>



    <path name="compress-offload-playback6 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback6 bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -1071,6 +1152,10 @@ 
        <path name="compress-offload-playback7 bt-sco" />

    </path>



    <path name="compress-offload-playback7 bt-sco-swb">

        <path name="compress-offload-playback7 bt-sco" />

    </path>



    <path name="compress-offload-playback7 speaker-and-display-port">

        <path name="compress-offload-playback7 display-port" />

        <path name="compress-offload-playback7" />
@@ -1120,6 +1205,11 @@ 
        <path name="compress-offload-playback7" />

    </path>



    <path name="compress-offload-playback7 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback7 bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -1137,6 +1227,10 @@ 
        <path name="compress-offload-playback8 bt-sco" />

    </path>



    <path name="compress-offload-playback8 bt-sco-swb">

        <path name="compress-offload-playback8 bt-sco" />

    </path>



    <path name="compress-offload-playback8 speaker-and-display-port">

        <path name="compress-offload-playback8 display-port" />

        <path name="compress-offload-playback8" />
@@ -1186,6 +1280,11 @@ 
        <path name="compress-offload-playback8" />

    </path>



    <path name="compress-offload-playback8 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback8 bt-sco-swb" />

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

    </path>



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

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

    </path>
@@ -1203,6 +1302,10 @@ 
        <path name="compress-offload-playback9 bt-sco" />

    </path>



    <path name="compress-offload-playback9 bt-sco-swb">

        <path name="compress-offload-playback9 bt-sco" />

    </path>



    <path name="compress-offload-playback9 speaker-and-display-port">

        <path name="compress-offload-playback9 display-port" />

        <path name="compress-offload-playback9" />
@@ -1252,6 +1355,11 @@ 
        <path name="compress-offload-playback9" />

    </path>



    <path name="compress-offload-playback9 speaker-and-bt-sco-swb">

        <path name="compress-offload-playback9 bt-sco-swb" />

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

    </path>



    <path name="audio-record">

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

    </path>
@@ -1269,6 +1377,10 @@ 
        <path name="audio-record bt-sco" />

    </path>



    <path name="audio-record bt-sco-swb">

        <path name="audio-record bt-sco" />

    </path>



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

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

    </path>
@@ -1286,6 +1398,10 @@ 
        <path name="audio-record-compress bt-sco" />

    </path>



    <path name="audio-record-compress bt-sco-swb">

        <path name="audio-record-compress bt-sco" />

    </path>



    <path name="audio-record-compress usb-headset-mic">

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

    </path>
@@ -1303,6 +1419,10 @@ 
        <path name="low-latency-record bt-sco" />

    </path>



    <path name="low-latency-record bt-sco-swb">

        <path name="low-latency-record bt-sco" />

    </path>



    <path name="low-latency-record usb-headset-mic">

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

    </path>
@@ -1339,6 +1459,10 @@ 
        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink bt-sco-swb">

        <path name="incall-rec-uplink" />

    </path>



    <path name="incall-rec-uplink usb-headset-mic">

        <path name="incall-rec-uplink" />

    </path>
@@ -1359,6 +1483,10 @@ 
        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-uplink-compress bt-sco-swb">

        <path name="incall-rec-uplink-compress" />

    </path>



    <path name="incall-rec-uplink-compress usb-headset-mic">

        <path name="incall-rec-uplink-compress" />

    </path>
@@ -1379,6 +1507,10 @@ 
        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink bt-sco-swb">

        <path name="incall-rec-downlink" />

    </path>



    <path name="incall-rec-downlink usb-headset-mic">

        <path name="incall-rec-downlink" />

    </path>
@@ -1399,6 +1531,10 @@ 
        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-downlink-compress bt-sco-swb">

        <path name="incall-rec-downlink-compress" />

    </path>



    <path name="incall-rec-downlink-compress usb-headset-mic">

        <path name="incall-rec-downlink-compress" />

    </path>
@@ -1420,6 +1556,10 @@ 
        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink bt-sco-swb">

        <path name="incall-rec-uplink-and-downlink" />

    </path>



    <path name="incall-rec-uplink-and-downlink usb-headset-mic">

        <path name="incall-rec-uplink-and-downlink" />

    </path>
@@ -1441,6 +1581,10 @@ 
        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink-compress bt-sco-swb">

        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>



    <path name="incall-rec-uplink-and-downlink-compress usb-headset-mic">

        <path name="incall-rec-uplink-and-downlink-compress" />

    </path>
@@ -1489,6 +1633,10 @@ 
        <path name="compress-voip-call bt-sco" />

    </path>



    <path name="compress-voip-call bt-sco-swb">

        <path name="compress-voip-call bt-sco" />

    </path>



    <path name="compress-voip-call afe-proxy">

        <ctl name="AFE_PCM_RX_Voice Mixer Voip" value="1" />

        <ctl name="Voip_Tx Mixer AFE_PCM_TX_Voip" value="1" />
@@ -1524,6 +1672,10 @@ 
        <path name="voicemmode1-call bt-sco" />

    </path>



    <path name="voicemmode1-call bt-sco-swb">

        <path name="voicemmode1-call bt-sco" />

    </path>



    <path name="voicemmode1-call afe-proxy">

        <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="1" />

        <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" />
@@ -1569,6 +1721,10 @@ 
        <path name="voicemmode2-call bt-sco" />

    </path>



    <path name="voicemmode2-call bt-sco-swb">

        <path name="voicemmode2-call bt-sco" />

    </path>



    <path name="voicemmode2-call afe-proxy">

        <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode2" value="1" />

        <ctl name="VoiceMMode2_Tx Mixer AFE_PCM_TX_MMode2" value="1" />
@@ -1612,6 +1768,10 @@ 
        <path name="audio-playback-voip bt-sco" />

    </path>



    <path name="audio-playback-voip bt-sco-swb">

        <path name="audio-playback-voip bt-sco" />

    </path>



    <path name="audio-playback-voip bt-a2dp">

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

    </path>
@@ -1655,6 +1815,10 @@ 
        <path name="audio-record-voip bt-sco" />

    </path>



    <path name="audio-record-voip bt-sco-swb">

        <path name="audio-record-voip bt-sco" />

    </path>



    <path name="spkr-rx-calib">

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

    </path>
@@ -2016,6 +2180,12 @@ 
    <path name="bt-sco-mic-wb">

    </path>



    <path name="bt-sco-headset-swb">

    </path>



    <path name="bt-sco-mic-swb">

    </path>



    <path name="usb-headset-mic">

    </path>
@@ -2412,6 +2582,10 @@ 
        <path name="mmap-playback bt-sco" />

    </path>



    <path name="mmap-playback bt-sco-swb">

        <path name="mmap-playback bt-sco" />

    </path>



    <path name="mmap-playback afe-proxy">

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

    </path>
@@ -2460,6 +2634,10 @@ 
        <path name="mmap-record bt-sco" />

    </path>



    <path name="mmap-record bt-sco-swb">

        <path name="mmap-record bt-sco" />

    </path>



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

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

    </path>
@@ -2520,6 +2698,10 @@ 
        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink bt-sco-swb">

        <path name="incall_music_uplink" />

    </path>



    <path name="incall_music_uplink speaker-and-display-port">

        <path name="incall_music_uplink" />

    </path>

configs/kona/mixer_paths_qrd.xml

+182 −0

File changed.

Preview size limit exceeded, changes collapsed.