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

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

Merge "hal: add tri-mic device definitions to source tracking"

parents 6d055348 b1e26aa6

hal/audio_extn/source_track.c

+6 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-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
@@ -145,6 +145,7 @@ static bool is_stt_supported_snd_device(snd_device_t snd_device) 
    case SND_DEVICE_IN_HANDSET_DMIC_AEC_NS:

    case SND_DEVICE_IN_HANDSET_STEREO_DMIC:

    case SND_DEVICE_IN_HANDSET_QMIC:

    case SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO:

    case SND_DEVICE_IN_VOICE_DMIC:

    case SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE:

    case SND_DEVICE_IN_HEADSET_MIC_FLUENCE:
@@ -155,11 +156,15 @@ static bool is_stt_supported_snd_device(snd_device_t snd_device) 
    case SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE:

    case SND_DEVICE_IN_SPEAKER_DMIC_AEC_BROADSIDE:

    case SND_DEVICE_IN_SPEAKER_DMIC_NS_BROADSIDE:

    case SND_DEVICE_IN_SPEAKER_TMIC_AEC:

    case SND_DEVICE_IN_SPEAKER_TMIC_NS:

    case SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS:

    case SND_DEVICE_IN_SPEAKER_QMIC_AEC:

    case SND_DEVICE_IN_SPEAKER_QMIC_NS:

    case SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS:

    case SND_DEVICE_IN_VOICE_SPEAKER_DMIC:

    case SND_DEVICE_IN_VOICE_SPEAKER_DMIC_BROADSIDE:

    case SND_DEVICE_IN_VOICE_SPEAKER_TMIC:

    case SND_DEVICE_IN_VOICE_SPEAKER_QMIC:

    case SND_DEVICE_IN_HANDSET_GENERIC_QMIC:

        ret = true;

hal/msm8916/platform.c

+4 −0
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_SPEAKER_QMIC_NS] = "quad-mic",

    [SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS] = "quad-mic",

    [SND_DEVICE_IN_THREE_MIC] = "three-mic",

    [SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO] = "three-mic",

    [SND_DEVICE_IN_HANDSET_TMIC] = "three-mic",

    [SND_DEVICE_IN_SPEAKER_TMIC_AEC] = "speaker-tmic",

    [SND_DEVICE_IN_SPEAKER_TMIC_NS] = "speaker-tmic",
@@ -713,6 +714,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_SPEAKER_QMIC_NS] = 127,

    [SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS] = 129,

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

    [SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO] = 125,

    [SND_DEVICE_IN_HANDSET_TMIC] = 125, /* for 3mic recording with fluence */

    [SND_DEVICE_IN_SPEAKER_TMIC_AEC] = 158,

    [SND_DEVICE_IN_SPEAKER_TMIC_NS] = 159,
@@ -867,6 +869,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_QMIC_NS)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS)},

    {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_SPEAKER_TMIC_AEC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_TMIC_NS)},
@@ -1695,6 +1698,7 @@ static void set_platform_defaults(struct platform_data * my_data) 
    hw_interface_table[SND_DEVICE_IN_SPEAKER_QMIC_NS] = strdup("SLIMBUS_0_TX");

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

    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_SPEAKER_TMIC_AEC] = strdup("SLIMBUS_0_TX");

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

hal/msm8916/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ enum { 
    SND_DEVICE_IN_SPEAKER_QMIC_NS,

    SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS,

    SND_DEVICE_IN_THREE_MIC,

    SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO,

    SND_DEVICE_IN_HANDSET_TMIC,

    SND_DEVICE_IN_SPEAKER_TMIC_AEC,

    SND_DEVICE_IN_SPEAKER_TMIC_NS,

hal/msm8974/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS] = 129,

    [SND_DEVICE_IN_VOICE_REC_QMIC_FLUENCE] = 125,

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

    [SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO] = 125,

    [SND_DEVICE_IN_HANDSET_TMIC_FLUENCE_PRO] = 138,

    [SND_DEVICE_IN_HANDSET_TMIC] = 153,

    [SND_DEVICE_IN_HANDSET_TMIC_AEC] = 154,

    [SND_DEVICE_IN_HANDSET_TMIC_NS] = 155,