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

Commit 6eca1198 authored by Satya Krishna Pindiproli's avatar Satya Krishna Pindiproli
Browse files

configs: sdm660: add default mixer controls 

When audioserver is killed and restarted, mixer controls
to set proper configuration are not issued if the stream being
opened after restart matches the default values in HAL.

This results in afe port start failure if the configuration
is unsupported by the end device.

Add default mixer controls for appropriate backends in
mixer paths of all SDM660 variants so that they are fired during
platform_init when audioserver is restarted.

CRs-Fixed: 2014040
Change-Id: I053faff32661f5e2db6f0e3b5ac190aeb3d83d24
parent 728d6336

configs/sdm660/mixer_paths.xml

+9 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ 
    <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />

    <ctl name="Display Port RX Bit Format" value="S16_LE" />

    <ctl name="Display Port RX SampleRate" value="KHZ_48" />

    <ctl name="Display Port RX Channels" value="Two" />

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

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

    <ctl name="INT4_MI2S_RX Audio Mixer MultiMedia2" value="0" />
@@ -139,9 +142,15 @@ 
    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="USB_AUDIO_RX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

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

    <ctl name="USB_AUDIO_TX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia6 Mixer INT3_MI2S_TX" value="0" />

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

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

configs/sdm660/mixer_paths_mtp.xml

+9 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ 
    <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />

    <ctl name="Display Port RX Bit Format" value="S16_LE" />

    <ctl name="Display Port RX SampleRate" value="KHZ_48" />

    <ctl name="Display Port RX Channels" value="Two" />

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

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

    <ctl name="INT4_MI2S_RX Audio Mixer MultiMedia2" value="0" />
@@ -139,9 +142,15 @@ 
    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="USB_AUDIO_RX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

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

    <ctl name="USB_AUDIO_TX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia6 Mixer INT3_MI2S_TX" value="0" />

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

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

configs/sdm660/mixer_paths_skuk.xml

+4 −1
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ 
    <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />

    <ctl name="Display Port RX Bit Format" value="S16_LE" />

    <ctl name="Display Port RX SampleRate" value="KHZ_48" />

    <ctl name="Display Port RX Channels" value="Two" />

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

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

    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -167,7 +170,7 @@ 
    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

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

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

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

    <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />

    <ctl name="USB_AUDIO_RX Format" value="S16_LE" />

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

configs/sdm660/mixer_paths_skus.xml

+9 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ 
    <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />

    <ctl name="Display Port RX Bit Format" value="S16_LE" />

    <ctl name="Display Port RX SampleRate" value="KHZ_48" />

    <ctl name="Display Port RX Channels" value="Two" />

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

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

    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -203,9 +206,15 @@ 
    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="USB_AUDIO_RX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

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

    <ctl name="USB_AUDIO_TX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />

    <ctl name="IIR0 INP0 MUX" value="ZERO" />

    <ctl name="IIR0 INP1 MUX" value="ZERO" />

configs/sdm660/mixer_paths_wcd9326.xml

+9 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ 
    <ctl name="DISPLAY_PORT Mixer MultiMedia14" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia15" value="0" />

    <ctl name="DISPLAY_PORT Mixer MultiMedia16" value="0" />

    <ctl name="Display Port RX Bit Format" value="S16_LE" />

    <ctl name="Display Port RX SampleRate" value="KHZ_48" />

    <ctl name="Display Port RX Channels" value="Two" />

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

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

    <ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia2" value="0" />
@@ -202,9 +205,15 @@ 
    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia14" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia15" value="0" />

    <ctl name="USB_AUDIO_RX Audio Mixer MultiMedia16" value="0" />

    <ctl name="USB_AUDIO_RX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_RX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia1 Mixer USB_AUDIO_TX" value="0" />

    <ctl name="MultiMedia5 Mixer USB_AUDIO_TX" value="0" />

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

    <ctl name="USB_AUDIO_TX Format" value="S16_LE" />

    <ctl name="USB_AUDIO_TX SampleRate" value="KHZ_48" />

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

    <ctl name="MultiMedia6 Mixer SLIM_0_TX" value="0" />

    <ctl name="IIR0 INP0 MUX" value="ZERO" />

    <ctl name="IIR0 INP1 MUX" value="ZERO" />