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

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

Merge "configs: lahaina: fix audio not heard over speaker for haptics"

parents 7229a21f 913aac34

configs/lahaina/mixer_paths.xml

+13 −13
Original line number Diff line number Diff line
@@ -2422,12 +2422,12 @@ 


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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2447,12 +2447,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2466,37 +2466,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2506,12 +2506,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_cdp.xml

+13 −13
Original line number Diff line number Diff line
@@ -2261,12 +2261,12 @@ 


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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2286,12 +2286,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2305,37 +2305,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2345,12 +2345,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_qrd.xml

+13 −13
Original line number Diff line number Diff line
@@ -2414,12 +2414,12 @@ 


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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2439,12 +2439,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2458,37 +2458,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2498,12 +2498,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_shimaidp.xml

+13 −13
Original line number Diff line number Diff line
@@ -2361,12 +2361,12 @@ 


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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2386,12 +2386,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2405,37 +2405,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2445,12 +2445,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <!-- These are actual sound device specific mixer settings -->

configs/lahaina/mixer_paths_shimaidps.xml

+13 −13
Original line number Diff line number Diff line
@@ -2221,12 +2221,12 @@ 


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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-display-port1">

        <path name="audio-with-haptics-playback display-port1" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback afe-proxy">
@@ -2246,12 +2246,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-usb-headphones">

        <path name="audio-with-haptics-playback usb-headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback headphones">
@@ -2265,37 +2265,37 @@ 


    <path name="audio-with-haptics-playback speaker-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-headphones">

        <path name="audio-with-haptics-playback headphones" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco">

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-sco-wb">

        <path name="audio-with-haptics-playback bt-sco-wb" />

        <path name="audio-with-haptics-playback" />

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

    </path>



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

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

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback bt-a2dp">
@@ -2305,12 +2305,12 @@ 


    <path name="audio-with-haptics-playback speaker-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <path name="audio-with-haptics-playback speaker-safe-and-bt-a2dp">

        <path name="audio-with-haptics-playback bt-a2dp" />

        <path name="audio-with-haptics-playback" />

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

    </path>



    <!-- These are actual sound device specific mixer settings -->