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

Commit 1879ae66 authored by Hari Krishna Chowdary Yennana's avatar Hari Krishna Chowdary Yennana
Browse files

hal: add support for 3 mic and 2 mic for FNN model 

- Add new devices for 3 mic and 2 mic FNN FV13 for voip and record usecases.
- Changes to pick 3 mic NN and 2 mic NN devices when FV13 is enabled.
- Update the backend for 3 mic and 2 mic in xml.

Change-Id: I82af6ae2d0f34503ed535c616a13a8bd15d4bc03
parent 65e27cbc

configs/lahaina/audio_platform_info_yupikidp.xml

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ 
<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  -->

<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->

<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->

<!--                                                                        -->

<!-- Changes from Qualcomm Innovation Center are provided under the following license:-->

<!-- Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- SPDX-License-Identifier: BSD-3-Clause-Clear                            -->

<audio_platform_info>

    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>
@@ -223,6 +227,7 @@ 
        <device name="SND_DEVICE_IN_HANDSET_MIC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>
@@ -245,9 +250,11 @@ 
        <device name="SND_DEVICE_IN_SPEAKER_MIC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_TMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS_SB" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_SB" interface="TX_CDC_DMA_TX_3"/>
@@ -299,6 +306,7 @@ 
        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_NN" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_NS" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_TMIC_AEC_NS" interface="TX_CDC_DMA_TX_3"/>

configs/lahaina/yupik_overlay/mixer_paths_yupikidp_overlay.xml

+22 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->

<!--                                                                        -->

<!-- Changes from Qualcomm Innovation Center are provided under the following license:-->

<!-- Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- SPDX-License-Identifier: BSD-3-Clause-Clear                            -->

<mixer>

    <ctl name="TX DEC0 MUX" value="MSM_DMIC"/>
@@ -98,6 +98,27 @@ 
        <ctl name="TX_AIF1_CAP Mixer DEC4" value="1"/>

        <ctl name="TX DMIC MUX4" value="DMIC1"/>

    </path>

    <path name="dmic-nn">

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

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

        <ctl name="TX_DEC1 Volume" value="104" />

        <ctl name="TX_DEC2 Volume" value="104" />

    </path>

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

        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Three" />

        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />

        <ctl name="TX DMIC MUX1" value="DMIC2" />

        <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" />

        <ctl name="TX DMIC MUX2" value="DMIC3" />

        <ctl name="TX_AIF1_CAP Mixer DEC3" value="1" />

        <ctl name="TX DMIC MUX3" value="DMIC5" />

        <ctl name="TX_DEC1 Volume" value="104" />

        <ctl name="TX_DEC2 Volume" value="104" />

        <ctl name="TX_DEC3 Volume" value="104" />

    </path>

    <path name="voice-tty-vco-handset-mic">

        <path name="dmic1"/>

    </path>

hal/acdb.h

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 *

 * Copyright (C) 2013 The Android Open Source Project

 *

 * Copyright (c) 2023, Qualcomm Innovation Center, Inc. All rights reserved.

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at
@@ -68,7 +69,7 @@ typedef int (*acdb_reload_t) (char *, char *, char *, int); 
typedef int (*acdb_reload_v2_t) (char *, char *, char *, struct listnode *);

typedef int (*acdb_send_gain_dep_cal_t)(int, int, int, int, int);

typedef void (*acdb_set_fluence_nn_state_t)(bool);

typedef bool (*acdb_get_fluence_nn_state_t)();

typedef int (*acdb_get_fluence_nn_state_t)();



struct meta_key_list {

    struct listnode list;

hal/msm8974/platform.c

+65 −15
Original line number Diff line number Diff line
@@ -742,6 +742,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_HANDSET_MIC_AEC_NS_SB] = "handset-mic",

    [SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN] = "handset-mic",

    [SND_DEVICE_IN_HANDSET_DMIC] = "dmic-endfire",

    [SND_DEVICE_IN_HANDSET_DMIC_NN] = "dmic-nn",

    [SND_DEVICE_IN_HANDSET_DMIC_AEC] = "dmic-endfire",

    [SND_DEVICE_IN_HANDSET_DMIC_AEC_SB] = "dmic-endfire",

    [SND_DEVICE_IN_HANDSET_DMIC_NS] = "dmic-endfire",
@@ -761,6 +762,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_SB] = "speaker-mic",

    [SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN] = "speaker-mic",

    [SND_DEVICE_IN_SPEAKER_DMIC] = "speaker-dmic-endfire",

    [SND_DEVICE_IN_SPEAKER_DMIC_NN] = "dmic-nn",

    [SND_DEVICE_IN_SPEAKER_DMIC_AEC] = "speaker-dmic-endfire",

    [SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB] = "speaker-dmic-endfire",

    [SND_DEVICE_IN_SPEAKER_DMIC_NS] = "speaker-dmic-endfire",
@@ -843,9 +845,11 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_HANDSET_TMIC_AEC] = "three-mic",

    [SND_DEVICE_IN_HANDSET_TMIC_NS] = "three-mic",

    [SND_DEVICE_IN_HANDSET_TMIC_AEC_NS] = "three-mic",

    [SND_DEVICE_IN_HANDSET_TMIC_NN] = "three-mic-nn",

    [SND_DEVICE_IN_SPEAKER_TMIC_AEC] = "speaker-tmic",

    [SND_DEVICE_IN_SPEAKER_TMIC_NS] = "speaker-tmic",

    [SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS] = "speaker-tmic",

    [SND_DEVICE_IN_SPEAKER_TMIC_NN] = "three-mic-nn",

    [SND_DEVICE_IN_VOICE_REC_TMIC] = "three-mic",

    [SND_DEVICE_IN_UNPROCESSED_MIC] = "unprocessed-mic",

    [SND_DEVICE_IN_UNPROCESSED_STEREO_MIC] = "unprocessed-stereo-mic",
@@ -901,18 +905,26 @@ static struct audio_effect_config effect_config_table[GET_IN_DEVICE_INDEX(SND_DE 
    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FLUENCE_PROV2,  0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_TM_FLUENCE_PRO_VC, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_TM_FLUENCE_PRO_VC,  0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_NN,  0x8000, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE)][EFFECT_AEC] = {TX_VOICE_DM_FV5_BROADSIDE, 0x0,

                                                                 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE)][EFFECT_NS] = {TX_VOICE_DM_FV5_BROADSIDE, 0x0,

                                                                0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC)][EFFECT_AEC] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC)][EFFECT_NS] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_TMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_TM_FLUENCE_EF, 0x8000, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_TMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_TM_FLUENCE_EF, 0x8000, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_TMIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_TMIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC)][EFFECT_AEC] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC)][EFFECT_NS] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x02},








@@ -925,10 +937,10 @@ static struct audio_effect_config effect_config_table[GET_IN_DEVICE_INDEX(SND_DE







    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_SB)][EFFECT_AEC] = {TX_VOICE_FLUENCE_SM_SB, 0x8000, 0x10EAF, 0x01},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_SB)][EFFECT_NS] = {TX_VOICE_FLUENCE_SM_SB, 0x8000, 0x10EAF, 0x02},

















    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_SM_NN, 0x8000, 0x10EAF, 0x01},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_SM_NN, 0x8000, 0x10EAF, 0x02},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_SM_NN, 0x8000, 0x10EAF, 0x01},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_SM_NN, 0x8000, 0x10EAF, 0x02},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x01},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x02},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x01},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_NN, 0x8000, 0x10EAF, 0x02},

















    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_MIC)][EFFECT_AEC] = {TX_VOICE_FLUENCEV5_SM, 0x0, 0x10EAF, 0x01},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_MIC)][EFFECT_NS] = {TX_VOICE_FLUENCEV5_SM, 0x0, 0x10EAF, 0x02},








@@ -1059,6 +1071,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = {







    [SND_DEVICE_IN_HANDSET_MIC_AEC_NS_SB] = 166,









    [SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN] = 186,









    [SND_DEVICE_IN_HANDSET_DMIC] = 41,









    [SND_DEVICE_IN_HANDSET_DMIC_NN] = 205,









    [SND_DEVICE_IN_HANDSET_DMIC_AEC] = 109,









    [SND_DEVICE_IN_HANDSET_DMIC_AEC_SB] = 168,









    [SND_DEVICE_IN_HANDSET_DMIC_NS] = 110,








@@ -1078,6 +1091,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = {







    [SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_SB] = 174,









    [SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN] = 192,









    [SND_DEVICE_IN_SPEAKER_DMIC] = 43,









    [SND_DEVICE_IN_SPEAKER_DMIC_NN] = 207,









    [SND_DEVICE_IN_SPEAKER_DMIC_AEC] = 115,









    [SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB] = 176,









    [SND_DEVICE_IN_SPEAKER_DMIC_NS] = 116,








@@ -1158,12 +1172,14 @@ static int acdb_device_table[SND_DEVICE_MAX] = {







    [SND_DEVICE_IN_THREE_MIC] = 46, /* for APSS Surround Sound Recording */









    [SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO] = 138,









    [SND_DEVICE_IN_HANDSET_TMIC] = 153,









    [SND_DEVICE_IN_HANDSET_TMIC_NN] = 206,









    [SND_DEVICE_IN_HANDSET_TMIC_AEC] = 154,









    [SND_DEVICE_IN_HANDSET_TMIC_NS] = 155,









    [SND_DEVICE_IN_HANDSET_TMIC_AEC_NS] = 156,









    [SND_DEVICE_IN_SPEAKER_TMIC_AEC] = 158,









    [SND_DEVICE_IN_SPEAKER_TMIC_NS] = 159,









    [SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS] = 160,









    [SND_DEVICE_IN_SPEAKER_TMIC_NN] = 208,









    [SND_DEVICE_IN_VOICE_REC_TMIC] = 125,









    [SND_DEVICE_IN_UNPROCESSED_MIC] = 143,









    [SND_DEVICE_IN_UNPROCESSED_STEREO_MIC] = 144,








@@ -1317,6 +1333,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = {







    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC_NS_SB)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC_NN)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_SB)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_DMIC_NS)},








@@ -1336,6 +1353,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = {







    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_SB)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_NN)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_NS)},








@@ -1417,12 +1435,14 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = {







    {TO_NAME_INDEX(SND_DEVICE_IN_THREE_MIC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_TMIC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_TMIC_NN)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_TMIC_AEC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_TMIC_NS)},









    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_TMIC_AEC_NS)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_AEC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_NS)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS)},









    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_NN)},









    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_REC_TMIC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_UNPROCESSED_MIC)},









    {TO_NAME_INDEX(SND_DEVICE_IN_UNPROCESSED_STEREO_MIC)},








@@ -2671,6 +2691,7 @@ static void set_platform_defaults(struct platform_data * my_data)







    hw_interface_table[SND_DEVICE_IN_HANDSET_MIC_AEC_NS_SB] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_DMIC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_DMIC_NN] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_DMIC_AEC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_DMIC_AEC_SB] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_DMIC_NS] = strdup("SLIMBUS_0_TX");








@@ -2693,6 +2714,7 @@ static void set_platform_defaults(struct platform_data * my_data)







    hw_interface_table[SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_SB] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_DMIC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_DMIC_NN] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_DMIC_AEC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_DMIC_NS] = strdup("SLIMBUS_0_TX");








@@ -2766,12 +2788,14 @@ static void set_platform_defaults(struct platform_data * my_data)







    hw_interface_table[SND_DEVICE_IN_THREE_MIC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_TMIC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_TMIC_NN] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_TMIC_AEC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_TMIC_NS] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_HANDSET_TMIC_AEC_NS] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_TMIC_AEC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_TMIC_NS] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_SPEAKER_TMIC_NN] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_VOICE_REC_TMIC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_UNPROCESSED_MIC] = strdup("SLIMBUS_0_TX");









    hw_interface_table[SND_DEVICE_IN_UNPROCESSED_STEREO_MIC] = strdup("SLIMBUS_0_TX");








@@ -3465,6 +3489,10 @@ void *platform_init(struct audio_device *adev)







            if (property_get_bool("persist.vendor.audio.fluence.tmic.enabled",false)) {









                my_data->fluence_type |= FLUENCE_TRI_MIC;









            }









        } else if (!strncmp("fluencenn", my_data->fluence_cap, sizeof("fluencenn"))) {









            if (property_get_bool("persist.vendor.audio.fluence.tmic.enabled",false)) {









                my_data->fluence_type = FLUENCE_TRI_MIC;









            }









        }









    }
















@@ -7156,7 +7184,9 @@ static snd_device_t get_snd_device_for_voice_comm_ecns_enabled(struct platform_d







                snd_device = SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS;









            } else if ((my_data->fluence_type & FLUENCE_TRI_MIC) &&









                       (my_data->source_mic_type & SOURCE_THREE_MIC)) {









                    snd_device = SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS;









                    snd_device = my_data->fluence_nn_enabled ?









                                    SND_DEVICE_IN_SPEAKER_TMIC_NN









                                    : SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS;









            } else if ((my_data->fluence_type & FLUENCE_DUAL_MIC) &&









                       (my_data->source_mic_type & SOURCE_DUAL_MIC)) {









                if (my_data->fluence_mode == FLUENCE_BROADSIDE)








@@ -7164,7 +7194,9 @@ static snd_device_t get_snd_device_for_voice_comm_ecns_enabled(struct platform_d







                else









                    snd_device = my_data->fluence_sb_enabled ?









                                     SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_SB









                                     : SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS;









                                     : (my_data->fluence_nn_enabled ?









                                        SND_DEVICE_IN_SPEAKER_DMIC_NN









                                        : SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS);









            }









            adev->acdb_settings |= DMIC_FLAG;









        } else








@@ -7176,13 +7208,17 @@ static snd_device_t get_snd_device_for_voice_comm_ecns_enabled(struct platform_d







    } else if (compare_device_type(in_devices, AUDIO_DEVICE_IN_BUILTIN_MIC)) {









        if ((my_data->fluence_type & FLUENCE_TRI_MIC) &&









            (my_data->source_mic_type & SOURCE_THREE_MIC)) {









            snd_device = SND_DEVICE_IN_HANDSET_TMIC_AEC_NS;









            snd_device = my_data->fluence_nn_enabled ?









                            SND_DEVICE_IN_HANDSET_TMIC_NN









                            : SND_DEVICE_IN_HANDSET_TMIC_AEC_NS;









            adev->acdb_settings |= TMIC_FLAG;









        } else if ((my_data->fluence_type & FLUENCE_DUAL_MIC) &&









            (my_data->source_mic_type & SOURCE_DUAL_MIC)) {









            snd_device = my_data->fluence_sb_enabled ?









                             SND_DEVICE_IN_HANDSET_DMIC_AEC_NS_SB









                             : SND_DEVICE_IN_HANDSET_DMIC_AEC_NS;









                             : (my_data->fluence_nn_enabled ?









                                SND_DEVICE_IN_HANDSET_DMIC_NN









                                : SND_DEVICE_IN_HANDSET_DMIC_AEC_NS);









            adev->acdb_settings |= DMIC_FLAG;









        } else









            snd_device = my_data->fluence_sb_enabled ?








@@ -7214,7 +7250,9 @@ static snd_device_t get_snd_device_for_voice_comm_ecns_disabled(struct platform_







                    snd_device = SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS;









                } else if ((my_data->fluence_type & FLUENCE_TRI_MIC) &&









                           (my_data->source_mic_type & SOURCE_THREE_MIC)) {









                        snd_device = SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS;









                        snd_device = my_data->fluence_nn_enabled ?









                                         SND_DEVICE_IN_SPEAKER_TMIC_NN









                                         : SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS;









                } else if ((my_data->fluence_type & FLUENCE_DUAL_MIC) &&









                           (my_data->source_mic_type & SOURCE_DUAL_MIC) &&









                           my_data->fluence_in_voice_comm) {








@@ -7223,7 +7261,9 @@ static snd_device_t get_snd_device_for_voice_comm_ecns_disabled(struct platform_







                    else









                        snd_device = my_data->fluence_sb_enabled ?









                                         SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_SB









                                         : SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS;









                                         : (my_data->fluence_nn_enabled ?









                                            SND_DEVICE_IN_SPEAKER_DMIC_NN









                                            : SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS);









                }









                adev->acdb_settings |= DMIC_FLAG;









            } else








@@ -7235,14 +7275,18 @@ static snd_device_t get_snd_device_for_voice_comm_ecns_disabled(struct platform_







        } else if (compare_device_type(in_devices, AUDIO_DEVICE_IN_BUILTIN_MIC)) {









            if ((my_data->fluence_type & FLUENCE_TRI_MIC) &&









                (my_data->source_mic_type & SOURCE_THREE_MIC)) {









                snd_device = SND_DEVICE_IN_HANDSET_TMIC_AEC_NS;









                snd_device = my_data->fluence_nn_enabled ?









                                 SND_DEVICE_IN_HANDSET_TMIC_NN









                                 : SND_DEVICE_IN_HANDSET_TMIC_AEC_NS;









                adev->acdb_settings |= TMIC_FLAG;









            } else if ((my_data->fluence_type & FLUENCE_DUAL_MIC) &&









                (my_data->source_mic_type & SOURCE_DUAL_MIC) &&









                my_data->fluence_in_voice_comm) {









                snd_device = my_data->fluence_sb_enabled ?









                                 SND_DEVICE_IN_HANDSET_DMIC_AEC_NS_SB









                                 : SND_DEVICE_IN_HANDSET_DMIC_AEC_NS;









                                 : (my_data->fluence_nn_enabled ?









                                    SND_DEVICE_IN_HANDSET_DMIC_NN









                                    : SND_DEVICE_IN_HANDSET_DMIC_AEC_NS);









                adev->acdb_settings |= DMIC_FLAG;









            } else









                snd_device = my_data->fluence_sb_enabled ?








@@ -7482,7 +7526,9 @@ snd_device_t platform_get_input_snd_device(void *platform,







            } else {









                if ((my_data->fluence_type & FLUENCE_TRI_MIC) &&









                    (my_data->source_mic_type & SOURCE_THREE_MIC)) {









                    snd_device = SND_DEVICE_IN_HANDSET_TMIC;









                    snd_device = my_data->fluence_nn_enabled ?









                                        SND_DEVICE_IN_HANDSET_TMIC_NN









                                        : SND_DEVICE_IN_HANDSET_TMIC;









                    adev->acdb_settings |= TMIC_FLAG;









                } else if (is_operator_tmus())









                    snd_device = SND_DEVICE_IN_VOICE_DMIC_TMUS;








@@ -7811,10 +7857,14 @@ snd_device_t platform_get_input_snd_device(void *platform,







                    snd_device = SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO;









                } else if ((my_data->fluence_type & FLUENCE_TRI_MIC) &&









                           (my_data->source_mic_type & SOURCE_THREE_MIC)) {









                    snd_device = SND_DEVICE_IN_HANDSET_TMIC;









                    snd_device = my_data->fluence_nn_enabled ?









                                    SND_DEVICE_IN_HANDSET_TMIC_NN









                                    : SND_DEVICE_IN_HANDSET_TMIC;









                } else if ((my_data->fluence_type & FLUENCE_DUAL_MIC) &&









                    (my_data->source_mic_type & SOURCE_DUAL_MIC)) {









                    snd_device = SND_DEVICE_IN_HANDSET_DMIC;









                    snd_device = my_data->fluence_nn_enabled ?









                                 SND_DEVICE_IN_HANDSET_DMIC_NN









                                 : SND_DEVICE_IN_HANDSET_DMIC;









                    platform_set_echo_reference(adev, true, out_devices);









                }









            }
































hal/msm8974/platform.h



+5
−0






























Original line number
Diff line number
Diff line







@@ -236,6 +236,7 @@ enum {







    SND_DEVICE_IN_HANDSET_MIC_AEC_NS_NN,









    SND_DEVICE_IN_HANDSET_MIC_AEC_NS_SB,









    SND_DEVICE_IN_HANDSET_DMIC,









    SND_DEVICE_IN_HANDSET_DMIC_NN,









    SND_DEVICE_IN_HANDSET_DMIC_AEC,









    SND_DEVICE_IN_HANDSET_DMIC_AEC_SB,









    SND_DEVICE_IN_HANDSET_DMIC_NS,








@@ -255,6 +256,7 @@ enum {







    SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_SB,









    SND_DEVICE_IN_SPEAKER_MIC_AEC_NS_NN,









    SND_DEVICE_IN_SPEAKER_DMIC,









    SND_DEVICE_IN_SPEAKER_DMIC_NN,









    SND_DEVICE_IN_SPEAKER_DMIC_AEC,









    SND_DEVICE_IN_SPEAKER_DMIC_AEC_SB,









    SND_DEVICE_IN_SPEAKER_DMIC_NS,








@@ -333,12 +335,14 @@ enum {







    SND_DEVICE_IN_THREE_MIC,









    SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO,









    SND_DEVICE_IN_HANDSET_TMIC,









    SND_DEVICE_IN_HANDSET_TMIC_NN,









    SND_DEVICE_IN_HANDSET_TMIC_AEC,









    SND_DEVICE_IN_HANDSET_TMIC_NS,









    SND_DEVICE_IN_HANDSET_TMIC_AEC_NS,









    SND_DEVICE_IN_SPEAKER_TMIC_AEC,









    SND_DEVICE_IN_SPEAKER_TMIC_NS,









    SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS,









    SND_DEVICE_IN_SPEAKER_TMIC_NN,









    SND_DEVICE_IN_VOICE_REC_TMIC,









    SND_DEVICE_IN_UNPROCESSED_MIC,









    SND_DEVICE_IN_UNPROCESSED_STEREO_MIC,








@@ -792,6 +796,7 @@ enum {







#define TX_VOICE_FLUENCE_SM_SB 0x10F38









#define TX_VOICE_FLUENCE_MM_SB 0x10F39









#define TX_VOICE_FLUENCE_SM_NN 0x10B0F









#define TX_VOICE_FLUENCE_NN 0x10B0F









#define TX_VOICE_FLUENCEV5_SM 0x10F32



















/* multi-mic surround ECNS zone control */