lkml.org 
[lkml]   [2021]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 244/306] ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER
    Date
    From: Cezary Rojewski <cezary.rojewski@intel.com>

    [ 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: Cezary Rojewski <cezary.rojewski@intel.com>
    Tested-by: Lukasz Majczak <lma@semihalf.com>
    Link: https://lore.kernel.org/r/20210818075742.1515155-6-cezary.rojewski@intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/intel/skylake/skl-messages.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
    index 476ef1897961..79c6cf2c14bf 100644
    --- a/sound/soc/intel/skylake/skl-messages.c
    +++ b/sound/soc/intel/skylake/skl-messages.c
    @@ -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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-16 18:31    [W:3.768 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site