diff options
| author | Mark Brown <broonie@kernel.org> | 2020-09-23 18:48:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-09-23 18:48:04 +0100 |
| commit | bbd59df075ab793c98ff7f95dc1f05895f6a6bc9 (patch) | |
| tree | 7b82c8bbabc7441a9badc75115ad5d1dffc66ecc /include/sound/soc-acpi.h | |
| parent | 3121420cf9b4db7f2bafcdc0e562f60779bf365d (diff) | |
| parent | 7cc3b56f7324ae120cf3ce57cf0366398eb02f60 (diff) | |
| download | linux-bbd59df075ab793c98ff7f95dc1f05895f6a6bc9.tar.bz2 | |
Merge series "ASoC: Intel: sdw machine driver updates for 5.10" from Kai Vehmanen <kai.vehmanen@linux.intel.com>:
Series including fixes and improvements for Intel SoundWire
machine drivers.
Bard Liao (1):
ASoC: Intel: add support for new SoundWire hardware layout on TGL
Pierre-Louis Bossart (4):
ASoC: Intel: sof_sdw: remove ternary operator
ASoC: Intel: add codec name prefix to ACPI machine description
ASoC: Intel: sof_sdw: remove hard-coded codec_conf table
ASoC: Intel: sof_sdw_rt700: add codec prefix
Rander Wang (1):
ASOC: Intel: sof_sdw: restore playback functionality with max98373
amps
include/sound/soc-acpi.h | 2 +
sound/soc/intel/boards/sof_sdw.c | 170 +++++++++---------
sound/soc/intel/boards/sof_sdw_common.h | 3 +
sound/soc/intel/boards/sof_sdw_max98373.c | 36 +++-
sound/soc/intel/boards/sof_sdw_rt700.c | 6 +-
.../intel/common/soc-acpi-intel-cml-match.c | 10 ++
.../intel/common/soc-acpi-intel-cnl-match.c | 1 +
.../intel/common/soc-acpi-intel-icl-match.c | 6 +
.../intel/common/soc-acpi-intel-tgl-match.c | 67 +++++++
9 files changed, 216 insertions(+), 85 deletions(-)
--
2.27.0
Diffstat (limited to 'include/sound/soc-acpi.h')
| -rw-r--r-- | include/sound/soc-acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index b77b05c413a3..b16a844d16ef 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -93,11 +93,13 @@ struct snd_soc_acpi_endpoint { * @adr: 64 bit ACPI _ADR value * @num_endpoints: number of endpoints for this device * @endpoints: array of endpoints + * @name_prefix: string used for codec controls */ struct snd_soc_acpi_adr_device { const u64 adr; const u8 num_endpoints; const struct snd_soc_acpi_endpoint *endpoints; + const char *name_prefix; }; /** |