ASoC: Intel: Skylake: Add channel map in updown mixer module IPC

DSP expects channel map to be sent in the IPC for updown mixer module.
So add ch_map info in updown mixer module config.

Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c
index 55414be23b82b63dab8fed269f9687e016ab3ea4..b9c205c8bb735e6311f53515bf038d3b1f9630f9 100644 (file)
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -706,6 +706,7 @@ static void skl_set_updown_mixer_format(struct skl_sst *ctx,
        skl_set_base_module_format(ctx, mconfig,
                (struct skl_base_cfg *)mixer_mconfig);
        mixer_mconfig->out_ch_cfg = fmt->ch_cfg;
+       mixer_mconfig->ch_map = fmt->ch_map;
 }
 
 /*

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 16cea466018cb1ccba9d8634f9df437c4366fd19..bc3c29161ed0062b55a83598de4159c2de499fd2 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -161,6 +161,7 @@ struct skl_up_down_mixer_cfg {
        u32 coeff_sel;
        /* Pass the user coeff in this array */
        s32 coeff[UP_DOWN_MIXER_MAX_COEFF];
+       u32 ch_map;
 } __packed;
 
 struct skl_algo_cfg {