Skip to content

Commit e4e0633

Browse files
crojewsk-intelbroonie
authored andcommitted
ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER
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: Cezary Rojewski <[email protected]> Tested-by: Lukasz Majczak <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent e8b374b commit e4e0633

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,9 +802,12 @@ static u16 skl_get_module_param_size(struct skl_dev *skl,
802802

803803
case SKL_MODULE_TYPE_BASE_OUTFMT:
804804
case SKL_MODULE_TYPE_MIC_SELECT:
805-
case SKL_MODULE_TYPE_KPB:
806805
return sizeof(struct skl_base_outfmt_cfg);
807806

807+
case SKL_MODULE_TYPE_MIXER:
808+
case SKL_MODULE_TYPE_KPB:
809+
return sizeof(struct skl_base_cfg);
810+
808811
default:
809812
/*
810813
* return only base cfg when no specific module type is
@@ -857,10 +860,14 @@ static int skl_set_module_format(struct skl_dev *skl,
857860

858861
case SKL_MODULE_TYPE_BASE_OUTFMT:
859862
case SKL_MODULE_TYPE_MIC_SELECT:
860-
case SKL_MODULE_TYPE_KPB:
861863
skl_set_base_outfmt_format(skl, module_config, *param_data);
862864
break;
863865

866+
case SKL_MODULE_TYPE_MIXER:
867+
case SKL_MODULE_TYPE_KPB:
868+
skl_set_base_module_format(skl, module_config, *param_data);
869+
break;
870+
864871
default:
865872
skl_set_base_module_format(skl, module_config, *param_data);
866873
break;

0 commit comments

Comments
 (0)