From af9c3b565cce109cecdff8806e00152b415da742 Mon Sep 17 00:00:00 2001 From: Kunlei Zhang Date: Mon, 11 Jan 2021 15:11:06 +0800 Subject: [PATCH] dsp: adm: change channel number for FLUENCE_NN_COPP_TOPOLOGY FLUENCE_NN_COPP_TOPOLOGY doesn't support stereo input. Update channel number to mono for FLUENCE_NN_COPP_TOPOLOGY. Change-Id: I51c0b55cc2bb7379ea79021fe0fc937ffbea6396 Signed-off-by: Kunlei Zhang --- dsp/q6adm.c | 3 ++- include/dsp/apr_audio-v2.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dsp/q6adm.c b/dsp/q6adm.c index 4b2006104ae4..e776459c9bc8 100644 --- a/dsp/q6adm.c +++ b/dsp/q6adm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. */ #include #include @@ -3143,6 +3143,7 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, if (topology == VPM_TX_VOICE_SMECNS_V2_COPP_TOPOLOGY || topology == VPM_TX_VOICE_FLUENCE_SM_COPP_TOPOLOGY || + topology == VPM_TX_VOICE_FLUENCE_NN_COPP_TOPOLOGY || topology == AUDIO_RX_MONO_VOIP_COPP_TOPOLOGY) channel_mode = 1; diff --git a/include/dsp/apr_audio-v2.h b/include/dsp/apr_audio-v2.h index 63168ba71abb..1edb15dc48fe 100644 --- a/include/dsp/apr_audio-v2.h +++ b/include/dsp/apr_audio-v2.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. */ @@ -5589,6 +5589,7 @@ struct afe_param_id_lpass_core_shared_clk_cfg { #define ADM_CMD_COPP_OPEN_TOPOLOGY_ID_AUDIOSPHERE 0x10028000 #define VPM_TX_DM_FLUENCE_EF_COPP_TOPOLOGY 0x10000005 #define AUDIO_RX_MONO_VOIP_COPP_TOPOLOGY 0x11000101 +#define VPM_TX_VOICE_FLUENCE_NN_COPP_TOPOLOGY 0x10028008 /* Memory map regions command payload used by the * #ASM_CMD_SHARED_MEM_MAP_REGIONS ,#ADM_CMD_SHARED_MEM_MAP_REGIONS