diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-08 16:54:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-08 16:54:50 +0100 |
| commit | 498495dba268b20e8eadd7fe93c140c68b6cc9d2 (patch) | |
| tree | 00d1562049d8bc2194fddd9ba0cbbe0812ad6f68 /sound/soc/intel/skylake/skl-messages.c | |
| parent | ASoC: Intel: Skylake: Disable clock gating during firmware and library download (diff) | |
| parent | ASoC: acpi: fix machine driver selection based on quirk (diff) | |
| download | linux-498495dba268b20e8eadd7fe93c140c68b6cc9d2.tar.xz linux-498495dba268b20e8eadd7fe93c140c68b6cc9d2.zip | |
Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel/skylake/skl-messages.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-messages.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/soc/intel/skylake/skl-messages.c b/sound/soc/intel/skylake/skl-messages.c index 933c1fbb222f..8cbf080c38b3 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -729,18 +729,11 @@ 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; + mixer_mconfig->ch_map = fmt->ch_map; } /* |