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

Commit 95886d54 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dsp: adm: change channel number for FLUENCE_NN_COPP_TOPOLOGY"

parents 0ff598a2 af9c3b56

dsp/q6adm.c

+2 −1
Original line number Diff line number Diff line 
// 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 <linux/module.h>

#include <linux/slab.h>
@@ -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;

include/dsp/apr_audio-v2.h

+2 −1
Original line number Diff line number Diff line 
/* 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