diff options
| author | Mark Brown <broonie@kernel.org> | 2023-05-22 17:48:41 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-05-22 17:48:41 +0300 |
| commit | 240ca9553fcd8da6851dc6b449996c21344b9b66 (patch) | |
| tree | 03cc9c729b3ec7eaf3305a6fdb1aabe67d26a334 /include | |
| parent | 3a2e3fa795052b42da013931bc2e451bcecf4f0c (diff) | |
| parent | 25148f57a2a6d157779bae494852e172952ba980 (diff) | |
| download | linux-240ca9553fcd8da6851dc6b449996c21344b9b66.tar.xz | |
ASoC: Intel: Fixes
Merge series from Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>:
Series of fixes for issues found during development and testing,
primarly for avs driver.
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-acpi.h | 1 | ||||
| -rw-r--r-- | include/uapi/sound/skl-tplg-interface.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index b38fd25c5729..528279056b3a 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -170,6 +170,7 @@ struct snd_soc_acpi_link_adr { /* Descriptor for SST ASoC machine driver */ struct snd_soc_acpi_mach { u8 id[ACPI_ID_LEN]; + const char *uid; const struct snd_soc_acpi_codecs *comp_ids; const u32 link_mask; const struct snd_soc_acpi_link_adr *links; diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h index f29899b179a6..4bf9c4f9add8 100644 --- a/include/uapi/sound/skl-tplg-interface.h +++ b/include/uapi/sound/skl-tplg-interface.h @@ -66,7 +66,8 @@ enum skl_ch_cfg { SKL_CH_CFG_DUAL_MONO = 9, SKL_CH_CFG_I2S_DUAL_STEREO_0 = 10, SKL_CH_CFG_I2S_DUAL_STEREO_1 = 11, - SKL_CH_CFG_4_CHANNEL = 12, + SKL_CH_CFG_7_1 = 12, + SKL_CH_CFG_4_CHANNEL = SKL_CH_CFG_7_1, SKL_CH_CFG_INVALID }; |