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

Unverified Commit 3e1b96c8 authored by Guneshwor Singh's avatar Guneshwor Singh Committed by Mark Brown
Browse files

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: default avatarGuneshwor Singh <guneshwor.o.singh@intel.com>
Acked-By: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cedb6415

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

+0 −8
Original line number Diff line number Diff line
@@ -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;

}



/*

sound/soc/intel/skylake/skl-topology.h

+1 −1
Original line number Diff line number Diff line
@@ -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