diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-13 14:07:37 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-13 14:07:37 +0000 |
| commit | 4727d4d775654986913a21c35c7cfaf1ecdafd62 (patch) | |
| tree | 8d9cc0ea1e8c43528b5e6fd69b1d82a36651069a /sound/soc/sof/ipc4-topology.h | |
| parent | 32ef0f1a7f01b1832e108380bb2178270058f1f6 (diff) | |
| parent | e041a2a550582106cba6a7c862c90dfc2ad14492 (diff) | |
ASoC: Merge up fixes as a dependency for future SOF work
New SOF changes require the current set of fixes.
Diffstat (limited to 'sound/soc/sof/ipc4-topology.h')
| -rw-r--r-- | sound/soc/sof/ipc4-topology.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/sof/ipc4-topology.h b/sound/soc/sof/ipc4-topology.h index 7877f0638011..22900b572766 100644 --- a/sound/soc/sof/ipc4-topology.h +++ b/sound/soc/sof/ipc4-topology.h @@ -46,7 +46,7 @@ #define SOF_IPC4_NODE_INDEX_INTEL_SSP(x) (((x) & 0xf) << 4) /* Node ID for DMIC type DAI copiers */ -#define SOF_IPC4_NODE_INDEX_INTEL_DMIC(x) (((x) & 0x7) << 5) +#define SOF_IPC4_NODE_INDEX_INTEL_DMIC(x) ((x) & 0x7) #define SOF_IPC4_GAIN_ALL_CHANNELS_MASK 0xffffffff #define SOF_IPC4_VOL_ZERO_DB 0x7fffffff @@ -279,14 +279,16 @@ struct sof_ipc4_control_data { * @init_val: Initial value * @curve_type: Curve type * @reserved: reserved for future use - * @curve_duration: Curve duration + * @curve_duration_l: Curve duration low part + * @curve_duration_h: Curve duration high part */ struct sof_ipc4_gain_data { uint32_t channels; uint32_t init_val; uint32_t curve_type; uint32_t reserved; - uint32_t curve_duration; + uint32_t curve_duration_l; + uint32_t curve_duration_h; } __aligned(8); /** |