On 12/4/23 07:56, Richard Fitzgerald wrote:
From: Bard Liao yung-chuan.liao@linux.intel.com
This is a test configuration for UpExtreme with Cirrus Logic CS35L56-EIGHT-C board.
The codec layout is configured as: - Link3: CS42L43 Jack - Link0: 2x CS35L56 Speaker (amps 1 and 2) - Link1: 2x CS35L56 Speaker (amps 7 and 8)
Signed-off-by: Bard Liao yung-chuan.liao@linux.intel.com Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Signed-off-by: Peter Ujfalusi peter.ujfalusi@linux.intel.com Signed-off-by: Richard Fitzgerald rf@opensource.cirrus.com
Changes since V1:
- Changed ALSA prefixes for CS35L56 to 'AMPn'
- Renumbered the CS35L56 prefixes to match the numbering of the OUTn speaker sockets on the EIGHT-C board
.../intel/common/soc-acpi-intel-tgl-match.c | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+)
diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c index 5804926c8b56..e5f721ba5ed4 100644 --- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+static const struct snd_soc_acpi_adr_device cs35l56_0_adr[] = {
- {
.adr = 0x00003301FA355601ull,.num_endpoints = 1,.endpoints = &spk_r_endpoint,.name_prefix = "AMP1"- },
- {
.adr = 0x00003201FA355601ull,.num_endpoints = 1,.endpoints = &spk_3_endpoint,.name_prefix = "AMP2"- }
+};
+static const struct snd_soc_acpi_adr_device cs35l56_1_adr[] = {
- {
.adr = 0x00013701FA355601ull,.num_endpoints = 1,.endpoints = &spk_l_endpoint,.name_prefix = "AMP8"- },
- {
.adr = 0x00013601FA355601ull,.num_endpoints = 1,.endpoints = &spk_2_endpoint,.name_prefix = "AMP7"- }
+};
Don't we need the same change of name_prefix for soc-acpi-intel-mtl-match.c? I see this in the existing code:
static const struct snd_soc_acpi_adr_device cs35l56_1_adr[] = { { .adr = 0x00013701FA355601ull, .num_endpoints = 1, .endpoints = &spk_r_endpoint, .name_prefix = "cs35l56-8" }, { .adr = 0x00013601FA355601ull, .num_endpoints = 1, .endpoints = &spk_3_endpoint, .name_prefix = "cs35l56-7" } };
static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = { { .adr = 0x00023301FA355601ull, .num_endpoints = 1, .endpoints = &spk_l_endpoint, .name_prefix = "cs35l56-1" }, { .adr = 0x00023201FA355601ull, .num_endpoints = 1, .endpoints = &spk_2_endpoint, .name_prefix = "cs35l56-2" } };