summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Trimmer <simont@opensource.cirrus.com>2024-12-06 15:59:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-07-17 18:37:02 +0200
commit97d14c04610cdc6f95a81f67072c3bbf33dca64a (patch)
tree78d71dcb8c4f31489434142d348e71ef3f4e6afc
parent724b93a6a694f8ddaa7206e702844467dc33a220 (diff)
ASoC: Intel: soc-acpi: arl: Correct naming of a cs35l56 address struct
[ Upstream commit a3003af649efb6f3d86d379d1e9a966ea6d5f5ab ] As there are many combinations these follow a naming scheme to make the content of link structures clearer: cs35l56_<controller link>_<l or r><unique instance id>_adr Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Link: https://patch.msgid.link/20241206075903.195730-10-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Stable-dep-of: a7528e9beadb ("ASoC: Intel: soc-acpi: arl: Correct order of cs42l43 matches") Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--sound/soc/intel/common/soc-acpi-intel-arl-match.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
index 24d850df77ca8..d7dfb23277d09 100644
--- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
@@ -138,7 +138,7 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_r1_adr[] = {
},
};
-static const struct snd_soc_acpi_adr_device cs35l56_3_l1_adr[] = {
+static const struct snd_soc_acpi_adr_device cs35l56_3_l3_adr[] = {
{
.adr = 0x00033301fa355601ull,
.num_endpoints = 1,
@@ -306,8 +306,8 @@ static const struct snd_soc_acpi_link_adr arl_cs42l43_l0_cs35l56_2_l23[] = {
},
{
.mask = BIT(3),
- .num_adr = ARRAY_SIZE(cs35l56_3_l1_adr),
- .adr_d = cs35l56_3_l1_adr,
+ .num_adr = ARRAY_SIZE(cs35l56_3_l3_adr),
+ .adr_d = cs35l56_3_l3_adr,
},
{}
};