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

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

Merge "configs: sdm660: Add EC Reference channels count"

parents 73a13935 8d5738d0

configs/sdm660/mixer_paths.xml

+26 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

    <!-- usb headset -->

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -428,13 +429,38 @@ 


    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



    <path name="echo-reference-voip headset">

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

    </path>



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

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

    </path>



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

configs/sdm660/mixer_paths_mtp.xml

+26 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

    <!-- usb headset -->

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -427,13 +428,38 @@ 


    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



    <path name="echo-reference-voip headset">

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

    </path>



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

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

    </path>



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

configs/sdm660/mixer_paths_skush.xml

+32 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

    <!-- usb headset -->

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -419,17 +420,48 @@ 


    <path name="echo-reference">

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

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

    </path>



   <path name="echo-reference handset">

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

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

   </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



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

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

    </path>



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

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

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

    </path>



   <path name="echo-reference-voip handset">

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

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

   </path>



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

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

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

    </path>



    <path name="echo-reference-voip headset">

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

    </path>



    <path name="echo-referenc-voip headphones-44.1">

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

    </path>



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

configs/sdm660/mixer_paths_tasha.xml

+30 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

    <!-- usb headset -->

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -614,6 +615,7 @@ 
        <ctl name="RX MIX TX1 MUX" value="RX_MIX_VBAT7" />

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

        <ctl name="VOC_EXT_EC MUX" value="SLIM_1_TX" />

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

   </path>



    <path name="echo-reference speaker-vbat-mono-2">
@@ -622,6 +624,7 @@ 
        <ctl name="RX MIX TX2 MUX" value="RX_MIX_VBAT8" />

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

        <ctl name="VOC_EXT_EC MUX" value="SLIM_1_TX" />

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

   </path>



   <path name="echo-reference speaker-vbat">
@@ -633,18 +636,45 @@ 
        <ctl name="RX MIX TX2 MUX" value="RX_MIX_VBAT8" />

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

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

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

    </path>



    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



    <path name="echo-reference-voip headset">

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

    </path>



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

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

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

    </path>



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

configs/sdm660/mixer_paths_tasha_skus.xml

+29 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ 
    <!-- HFP end -->

    <!-- echo reference -->

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

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

    <!-- usb headset -->

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

    <ctl name="AFE_PCM_RX Audio Mixer MultiMedia2" value="0" />
@@ -614,6 +615,7 @@ 
        <ctl name="RX MIX TX1 MUX" value="RX_MIX_VBAT7" />

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

        <ctl name="VOC_EXT_EC MUX" value="SLIM_1_TX" />

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

   </path>



   <path name="echo-reference speaker-vbat">
@@ -625,18 +627,45 @@ 
        <ctl name="RX MIX TX2 MUX" value="RX_MIX_VBAT8" />

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

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

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

    </path>



    <path name="echo-reference">

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

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

    </path>



    <path name="echo-reference headphones">

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

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

    </path>



    <path name="echo-reference headset">

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



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

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

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

    </path>



    <path name="echo-reference-voip headset">

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

    </path>



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

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

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

    </path>



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