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

Commit f6ff4d56 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Greg Kroah-Hartman
Browse files

ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER 



[ Upstream commit e4e0633bcadc950b4b4af06c7f1bb7f7e3e86321 ]

KeyPhrasebuffer, Mixin and Mixout modules configuration is described by
firmware's basic module configuration structure. There are no extended
parameters required. Update functions taking part in building
INIT_INSTANCE IPC payload to reflect that.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Tested-by: default avatarLukasz Majczak <lma@semihalf.com>
Link: https://lore.kernel.org/r/20210818075742.1515155-6-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 736f60bd

sound/soc/intel/skylake/skl-messages.c

+9 −2
Original line number Diff line number Diff line
@@ -802,9 +802,12 @@ static u16 skl_get_module_param_size(struct skl_dev *skl, 


	case SKL_MODULE_TYPE_BASE_OUTFMT:

	case SKL_MODULE_TYPE_MIC_SELECT:

	case SKL_MODULE_TYPE_KPB:

		return sizeof(struct skl_base_outfmt_cfg);



	case SKL_MODULE_TYPE_MIXER:

	case SKL_MODULE_TYPE_KPB:

		return sizeof(struct skl_base_cfg);



	default:

		/*

		 * return only base cfg when no specific module type is
@@ -857,10 +860,14 @@ static int skl_set_module_format(struct skl_dev *skl, 


	case SKL_MODULE_TYPE_BASE_OUTFMT:

	case SKL_MODULE_TYPE_MIC_SELECT:

	case SKL_MODULE_TYPE_KPB:

		skl_set_base_outfmt_format(skl, module_config, *param_data);

		break;



	case SKL_MODULE_TYPE_MIXER:

	case SKL_MODULE_TYPE_KPB:

		skl_set_base_module_format(skl, module_config, *param_data);

		break;



	default:

		skl_set_base_module_format(skl, module_config, *param_data);

		break;