UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Intel: Skylake: Add support for Mic Select module 

Mic select is a DSP module which is used to select one or many
inputs to form an output. This is useful to select data
selectively from PDM input and hence the name. This module is of
generic module type.

This patch adds support to add and configure Mic select module in
firmware topology.

Signed-off-by: Dharageswari R <dharageswari.r@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Dharageswari R 2015-12-03 23:29:52 +05:30 committed by Mark Brown
parent b18c458de1
commit fd18110f14
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/intel/skylake/skl-messages.c
View File

@ -410,6 +410,25 @@ static void skl_set_algo_format(struct skl_sst *ctx,
} }
/*
* Mic select module allows selecting one or many input channels, thus
* acting as a demux.
*
* Mic select module take base module configuration and out-format
* configuration
*/
static void skl_set_base_outfmt_format(struct skl_sst *ctx,
struct skl_module_cfg *mconfig,
struct skl_base_outfmt_cfg *base_outfmt_mcfg)
{
struct skl_audio_data_format *out_fmt = &base_outfmt_mcfg->out_fmt;
struct skl_base_cfg *base_cfg =
(struct skl_base_cfg *)base_outfmt_mcfg;
skl_set_base_module_format(ctx, mconfig, base_cfg);
skl_setup_out_format(ctx, mconfig, out_fmt);
}
static u16 skl_get_module_param_size(struct skl_sst *ctx, static u16 skl_get_module_param_size(struct skl_sst *ctx,
struct skl_module_cfg *mconfig) struct skl_module_cfg *mconfig)
{ {
@ -432,6 +451,9 @@ static u16 skl_get_module_param_size(struct skl_sst *ctx,
param_size += mconfig->formats_config.caps_size; param_size += mconfig->formats_config.caps_size;
return param_size; return param_size;
case SKL_MODULE_TYPE_BASE_OUTFMT:
return sizeof(struct skl_base_outfmt_cfg);
default: default:
/* /*
* return only base cfg when no specific module type is * return only base cfg when no specific module type is
@ -482,6 +504,10 @@ static int skl_set_module_format(struct skl_sst *ctx,
skl_set_algo_format(ctx, module_config, *param_data); skl_set_algo_format(ctx, module_config, *param_data);
break; break;
case SKL_MODULE_TYPE_BASE_OUTFMT:
skl_set_base_outfmt_format(ctx, module_config, *param_data);
break;
default: default:
skl_set_base_module_format(ctx, module_config, *param_data); skl_set_base_module_format(ctx, module_config, *param_data);
break; break;

5
sound/soc/intel/skylake/skl-topology.h
View File

@ -145,6 +145,11 @@ struct skl_algo_cfg {
char params[0]; char params[0];
} __packed; } __packed;
struct skl_base_outfmt_cfg {
struct skl_base_cfg base_cfg;
struct skl_audio_data_format out_fmt;
} __packed;
enum skl_dma_type { enum skl_dma_type {
SKL_DMA_HDA_HOST_OUTPUT_CLASS = 0, SKL_DMA_HDA_HOST_OUTPUT_CLASS = 0,
SKL_DMA_HDA_HOST_INPUT_CLASS = 1, SKL_DMA_HDA_HOST_INPUT_CLASS = 1,

3
sound/soc/intel/skylake/skl-tplg-interface.h
View File

@ -79,7 +79,8 @@ enum skl_module_type {
SKL_MODULE_TYPE_COPIER, SKL_MODULE_TYPE_COPIER,
SKL_MODULE_TYPE_UPDWMIX, SKL_MODULE_TYPE_UPDWMIX,
SKL_MODULE_TYPE_SRCINT, SKL_MODULE_TYPE_SRCINT,
SKL_MODULE_TYPE_ALGO SKL_MODULE_TYPE_ALGO,
SKL_MODULE_TYPE_BASE_OUTFMT
}; };
enum skl_core_affinity { enum skl_core_affinity {