diff options
| author | Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2020-08-21 14:55:51 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-08-24 13:41:27 +0100 |
| commit | 6cb8bd60ba5ca9eb8f05f3f8351bbbcb6b92c525 (patch) | |
| tree | 3383e0149b4ba7dfe3807865b793d39d815d30e9 /sound/soc/intel/common/soc-acpi-intel-cml-match.c | |
| parent | b161a12192f4b88cede8a563a6ebd2336d905d18 (diff) | |
| download | linux-stable-6cb8bd60ba5ca9eb8f05f3f8351bbbcb6b92c525.tar.gz linux-stable-6cb8bd60ba5ca9eb8f05f3f8351bbbcb6b92c525.tar.bz2 linux-stable-6cb8bd60ba5ca9eb8f05f3f8351bbbcb6b92c525.zip | |
ASoC: Intel: soc-acpi: mirror CML and TGL configurations
Some TGL devices use the same audio hardware as on CML platforms, with
RT711 on link0, RT1308 on link1 and optionally link2, and RT715 on
link 3.
To clarify configurations, the rt1308 configurations are split between
single amp on link1 and dual amps on link1. The case with two amps on
different links is already identified with the group1 attribute.
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200821195603.215535-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-cml-match.c')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-cml-match.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c index 51535cd60a0a..8ac01a2d5886 100644 --- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c @@ -118,7 +118,7 @@ static const struct snd_soc_acpi_adr_device rt711_0_adr[] = { } }; -static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = { +static const struct snd_soc_acpi_adr_device rt1308_1_single_adr[] = { { .adr = 0x000120025D130800, .num_endpoints = 1, @@ -182,8 +182,8 @@ static const struct snd_soc_acpi_link_adr cml_3_in_1_mono_amp[] = { }, { .mask = BIT(1), - .num_adr = ARRAY_SIZE(rt1308_1_adr), - .adr_d = rt1308_1_adr, + .num_adr = ARRAY_SIZE(rt1308_1_single_adr), + .adr_d = rt1308_1_single_adr, }, { .mask = BIT(3), |