ASoC: Intel: Skylake: Fix updown mixer module format

DSP expects length of the coefficient for updown mixer module to be 8.
So fix the max coefficient length and since we are using default values
for coefficient select which is zero, we need not explicitly initialize
it.

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 89f70133c8e4e344ea5f8365dd257a0ef47de56e..55414be23b82b63dab8fed269f9687e016ab3ea4 100644 (file)
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
@@ -702,18 +702,10 @@ static void skl_set_updown_mixer_format(struct skl_sst *ctx,
        struct skl_module *module = mconfig->module;
        struct skl_module_iface *iface = &module->formats[mconfig->fmt_idx];
        struct skl_module_fmt *fmt = &iface->outputs[0].fmt;
-       int i = 0;
 
        skl_set_base_module_format(ctx, mconfig,
                (struct skl_base_cfg *)mixer_mconfig);
        mixer_mconfig->out_ch_cfg = fmt->ch_cfg;
-
-       /* Select F/W default coefficient */
-       mixer_mconfig->coeff_sel = 0x0;
-
-       /* User coeff, don't care since we are selecting F/W defaults */
-       for (i = 0; i < UP_DOWN_MIXER_MAX_COEFF; i++)
-               mixer_mconfig->coeff[i] = 0xDEADBEEF;
 }
 
 /*

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 2717db92036b4cc58ac7148904b41d00d16d4805..16cea466018cb1ccba9d8634f9df437c4366fd19 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -34,7 +34,7 @@
 #define MAX_FIXED_DMIC_PARAMS_SIZE 727
 
 /* Maximum number of coefficients up down mixer module */
-#define UP_DOWN_MIXER_MAX_COEFF                6
+#define UP_DOWN_MIXER_MAX_COEFF                8
 
 #define MODULE_MAX_IN_PINS     8
 #define MODULE_MAX_OUT_PINS    8