diff options
| author | Mark Brown <broonie@kernel.org> | 2017-11-10 21:30:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-10 21:30:41 +0000 |
| commit | 60190e46df7fc6e9fe558e3c0aa8af8d70ebc8fa (patch) | |
| tree | b4e80524b92ba59d9af6396efad05bbcf591e960 /sound/soc/intel/skylake/skl-messages.c | |
| parent | 16a077e17ccf275a56fa21aa36a019ab063064f9 (diff) | |
| parent | 3b47c9dc75be097bc0e2f3ac4b176fbf3eed85f2 (diff) | |
| download | talos-op-linux-60190e46df7fc6e9fe558e3c0aa8af8d70ebc8fa.tar.gz talos-op-linux-60190e46df7fc6e9fe558e3c0aa8af8d70ebc8fa.zip | |
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
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 89f70133c8e4..b9c205c8bb73 100644 --- a/sound/soc/intel/skylake/skl-messages.c +++ b/sound/soc/intel/skylake/skl-messages.c @@ -702,18 +702,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; } /* |
