diff options
| -rw-r--r-- | sound/soc/amd/acp/amd-acp70-acpi-match.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/amd-acp70-acpi-match.c index 93eb01a00a0c..44fab145aa59 100644 --- a/sound/soc/amd/acp/amd-acp70-acpi-match.c +++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c @@ -187,7 +187,7 @@ static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = { }, }; -static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = { +static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] = { { .adr = 0x00003001FA424301ull, .num_endpoints = ARRAY_SIZE(cs42l43_endpoints), @@ -196,7 +196,7 @@ static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = { } }; -static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = { +static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123_adr[] = { { .adr = 0x00013001FA424301ull, .num_endpoints = ARRAY_SIZE(cs42l43_endpoints), @@ -229,7 +229,7 @@ static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = { }, }; -static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] = { +static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] = { { .adr = 0x00013301FA355601ull, .num_endpoints = 1, @@ -256,34 +256,34 @@ static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] = { }, }; -static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1_cs35l56x4_l1[] = { +static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u0123[] = { { .mask = BIT(1), - .num_adr = ARRAY_SIZE(cs42l43_1_cs35l56x4_1_adr), - .adr_d = cs42l43_1_cs35l56x4_1_adr, + .num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr), + .adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr, }, {} }; -static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0_cs35l56x4_l1[] = { +static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u0_cs35l56x4_l1u3210[] = { { .mask = BIT(0), - .num_adr = ARRAY_SIZE(cs42l43_0_adr), - .adr_d = cs42l43_0_adr, + .num_adr = ARRAY_SIZE(cs42l43_l0u0_adr), + .adr_d = cs42l43_l0u0_adr, }, { .mask = BIT(1), - .num_adr = ARRAY_SIZE(cs35l56x4_1_adr), - .adr_d = cs35l56x4_1_adr, + .num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr), + .adr_d = cs35l56x4_l1u3210_adr, }, {} }; -static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1[] = { +static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] = { { .mask = BIT(1), - .num_adr = ARRAY_SIZE(cs35l56x4_1_adr), - .adr_d = cs35l56x4_1_adr, + .num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr), + .adr_d = cs35l56x4_l1u3210_adr, }, {} }; @@ -333,17 +333,17 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = { }, { .link_mask = BIT(0) | BIT(1), - .links = acp70_cs42l43_l0_cs35l56x4_l1, + .links = acp70_cs42l43_l0u0_cs35l56x4_l1u3210, .drv_name = "amd_sdw", }, { .link_mask = BIT(1), - .links = acp70_cs42l43_l1_cs35l56x4_l1, + .links = acp70_cs42l43_l1u0_cs35l56x4_l1u0123, .drv_name = "amd_sdw", }, { .link_mask = BIT(1), - .links = acp70_cs35l56x4_l1, + .links = acp70_cs35l56x4_l1u3210, .drv_name = "amd_sdw", }, { |