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

Commit 49c8dcec authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: extend unprocessed audio"

parents 1921622b 8937497b

configs/msm8996/audio_platform_info.xml

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ 
    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>

        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_QAUD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

    </acdb_ids>

    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>

configs/msm8996/mixer_paths.xml

+17 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.    -->

<!-- Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.    -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -2205,6 +2204,22 @@ 
        <path name="unprocessed-handset-mic" />

    </path>



    <path name="unprocessed-stereo-mic">

        <path name="voice-rec-dmic-ef" />

    </path>



    <path name="unprocessed-three-mic">

        <path name="three-mic" />

    </path>



    <path name="unprocessed-quad-mic">

        <path name="quad-mic" />

    </path>



    <path name="unprocessed-headset-mic">

        <path name="headset-mic" />

    </path>



    <!-- Added for ADSP testfwk -->

    <path name="ADSP testfwk">

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

configs/msm8996/mixer_paths_tasha.xml

+17 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.    -->

<!-- Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.    -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -2514,6 +2514,22 @@ 
        <path name="unprocessed-handset-mic" />

    </path>



    <path name="unprocessed-stereo-mic">

        <path name="voice-rec-dmic-ef" />

    </path>



    <path name="unprocessed-three-mic">

        <path name="three-mic" />

    </path>



    <path name="unprocessed-quad-mic">

        <path name="quad-mic" />

    </path>



    <path name="unprocessed-headset-mic">

        <path name="headset-mic" />

    </path>



    <!-- Added for ADSP testfwk -->

    <path name="ADSP testfwk">

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

configs/msm8998/audio_platform_info.xml

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 
        <device name="SND_DEVICE_OUT_VOICE_SPEAKER_2_PROTECTED_VBAT" acdb_id="150"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" acdb_id="151"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" acdb_id="152"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_MIC" acdb_id="143"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" acdb_id="144"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

    </acdb_ids>

    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>

configs/msm8998/mixer_paths.xml

+17 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!-- Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.    -->

<!-- Copyright (c) 2015-2016, 2018, The Linux Foundation. All rights reserved.    -->

<!--                                                                        -->

<!-- Redistribution and use in source and binary forms, with or without     -->

<!-- modification, are permitted provided that the following conditions are -->
@@ -2049,6 +2049,22 @@ 
        <path name="unprocessed-handset-mic" />

    </path>



    <path name="unprocessed-stereo-mic">

        <path name="voice-rec-dmic-ef" />

    </path>



    <path name="unprocessed-three-mic">

        <path name="three-mic" />

    </path>



    <path name="unprocessed-quad-mic">

        <path name="quad-mic" />

    </path>



    <path name="unprocessed-headset-mic">

        <path name="headset-mic" />

    </path>



    <!-- Added for ADSP testfwk -->

    <path name="ADSP testfwk">

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