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

Commit 2236b19d authored by Aditya Bavanari's avatar Aditya Bavanari Committed by Gerrit - the friendly Code Review server
Browse files

configs: scuba: Reduce digital volume for headphones 

Reduce RX digital volume for headphone use case
to 65 in order to avoid random mute issues.
Use mixer controls instead of paths directly in
speaker and headphones combo use case.

Change-Id: I4fee553f01eadcc376b89c49e579f2a87a552c7e
parent bb795e6a

configs/bengal/mixer_paths_scubaidp.xml

+21 −6
Original line number Diff line number Diff line
@@ -2611,6 +2611,8 @@ 
        <ctl name="HPHR_COMP Switch" value="1" />

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

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

        <ctl name="RX_RX0 Digital Volume" value="65" />

        <ctl name="RX_RX1 Digital Volume" value="65" />

    </path>



    <path name="headphones-44.1">
@@ -2714,13 +2716,27 @@ 
    </path>



    <path name="speaker-and-headphones">

        <path name="headphones" />

        <path name="speaker" />

        <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />

        <ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />

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

        <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />

        <ctl name="RX INT1_1 MIX1 INP0" value="RX1" />

        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />

        <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />

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

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

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

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

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

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

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

        <ctl name="SpkrMono WSA_RDAC" value="Switch" />

        <ctl name="RX_RX0 Digital Volume" value="65" />

        <ctl name="RX_RX1 Digital Volume" value="65" />

    </path>



    <path name="speaker-and-headphones-hifi-filter">

        <path name="headphones" />

        <path name="speaker" />

        <path name="speaker-and-headphones" />

    </path>



    <path name="speaker-safe-and-headphones">
@@ -2737,8 +2753,7 @@ 
    </path>



    <path name="speaker-and-headphones-liquid">

        <path name="headphones" />

        <path name="speaker" />

        <path name="speaker-and-headphones" />

    </path>



    <path name="speaker-safe-and-headphones-liquid">

configs/bengal/mixer_paths_scubaqrd.xml

+21 −7
Original line number Diff line number Diff line
@@ -2496,7 +2496,6 @@ 
        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />

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

        <ctl name="SpkrMono WSA_RDAC" value="Switch" />

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

    </path>



    <path name="speaker-mono">
@@ -2589,6 +2588,8 @@ 
        <ctl name="HPHR_COMP Switch" value="1" />

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

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

        <ctl name="RX_RX0 Digital Volume" value="65" />

        <ctl name="RX_RX1 Digital Volume" value="65" />

    </path>



    <path name="headphones-44.1">
@@ -2694,13 +2695,27 @@ 
    </path>



    <path name="speaker-and-headphones">

        <path name="headphones" />

        <path name="speaker" />

        <ctl name="RX_MACRO RX0 MUX" value="AIF1_PB" />

        <ctl name="RX_MACRO RX1 MUX" value="AIF1_PB" />

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

        <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />

        <ctl name="RX INT1_1 MIX1 INP0" value="RX1" />

        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />

        <ctl name="RX INT1 DEM MUX" value="CLSH_DSM_OUT" />

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

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

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

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

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

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

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

        <ctl name="SpkrMono WSA_RDAC" value="Switch" />

        <ctl name="RX_RX0 Digital Volume" value="65" />

        <ctl name="RX_RX1 Digital Volume" value="65" />

    </path>



    <path name="speaker-and-headphones-hifi-filter">

        <path name="headphones" />

        <path name="speaker" />

        <path name="speaker-and-headphones" />

    </path>



    <path name="speaker-safe-and-headphones">
@@ -2717,8 +2732,7 @@ 
    </path>



    <path name="speaker-and-headphones-liquid">

        <path name="headphones" />

        <path name="speaker" />

        <path name="speaker-and-headphones" />

    </path>



    <path name="speaker-safe-and-headphones-liquid">