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

Commit ea4da1f0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 0e1c608b on remote branch 

Change-Id: If56f221dac39de83abd59966f247fe77b3c1426e
parents dc9d71b4 0e1c608b

configs/atoll/audio_platform_info_intcodec.xml

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ 
        <param key="spkr_1_tz_name" value="wsatz.13"/>

        <param key="spkr_2_tz_name" value="wsatz.14"/>

        <param key="true_32_bit" value="true"/>

        <param key="hifi_filter" value="false"/>

        <param key="native_audio_mode" value="multiple_mix_dsp"/>

        <param key="hfp_pcm_dev_id" value="39"/>

        <param key="input_mic_max_count" value="4"/>
@@ -105,6 +106,7 @@ 
    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -112,6 +114,7 @@ 
        <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

configs/atoll/audio_platform_info_qrd.xml

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
        <param key="mono_speaker" value="left"/>

        <param key="spkr_2_tz_name" value="wsatz.13"/>

        <param key="true_32_bit" value="true"/>

        <param key="hifi_filter" value="false"/>

        <param key="native_audio_mode" value="multiple_mix_dsp"/>

        <param key="hfp_pcm_dev_id" value="39"/>

        <param key="input_mic_max_count" value="2"/>
@@ -104,6 +105,7 @@ 
    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HEADPHONES_HIFI_FILTER" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_HEADPHONES_44_1" backend="headphones-44.1" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>

        <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
@@ -111,6 +113,7 @@ 
        <device name="SND_DEVICE_OUT_LINE" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_HIFI_FILTER" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="WSA_CDC_DMA_RX_0-and-RX_CDC_DMA_RX_0"/>

        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

configs/atoll/mixer_paths.xml

+9 −0
Original line number Diff line number Diff line
@@ -2763,6 +2763,10 @@ 
        <path name="headphones" />

    </path>



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

        <path name="headphones" />

    </path>



    <path name="hph-highquality-mode">

    </path>
@@ -2852,6 +2856,11 @@ 
        <path name="speaker" />

    </path>



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

        <path name="headphones" />

        <path name="speaker" />

    </path>



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

        <path name="headphones" />

        <path name="speaker-safe" />

configs/atoll/mixer_paths_qrd.xml

+9 −0
Original line number Diff line number Diff line
@@ -3044,6 +3044,10 @@ 
        <path name="headphones" />

    </path>



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

        <path name="headphones" />

    </path>



    <path name="hph-highquality-mode">

        <ctl name="RX_HPH_PWR_MODE" value="LOHIFI" />

        <ctl name="RX HPH Mode" value="CLS_H_LOHIFI" />
@@ -3110,6 +3114,11 @@ 
        <path name="speaker" />

    </path>



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

        <path name="headphones" />

        <path name="speaker" />

    </path>



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

        <path name="headphones" />

        <path name="speaker-safe" />