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-topology.h | |
| 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-topology.h')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index 2717db92036b..bc3c29161ed0 100644 --- 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 @@ -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 { |
