ACK/Cmnt: [SRU][O][PATCH 1/4] ASoC: Intel: soc-acpi: arl: Add match entries for new cs42l43 laptops
Kuba Pawlak
kuba.pawlak at canonical.com
Tue Apr 15 16:25:24 UTC 2025
On 15.04.2025 14:31, Aaron Ma wrote:
>
>
> On 4/15/25 8:19 PM, Kuba Pawlak wrote:
>> On 15.04.2025 13:31, Aaron Ma wrote:
>>> From: Charles Keepax <ckeepax at opensource.cirrus.com>
>>>
>>> BugLink: https://bugs.launchpad.net/bugs/2106394
>>>
>>> Add some new match table entries on Arrowlake for some coming cs42l43
>>> laptops.
>>>
>>> Signed-off-by: Charles Keepax <ckeepax at opensource.cirrus.com>
>>> Reviewed-by: Pierre-Louis Bossart
>>> <pierre-louis.bossart at linux.intel.com>
>>> Signed-off-by: Bard Liao <yung-chuan.liao at linux.intel.com>
>>> Link:
>>> https://patch.msgid.link/20240827123215.258859-15-yung-chuan.liao@linux.intel.com
>>> Signed-off-by: Mark Brown <broonie at kernel.org>
>>> (backported from commit c0524067653d07e78bc215220bc111b6e5e4a94d)
>>> [AaronMa: context change because of earlier backports.]
>>> Signed-off-by: Aaron Ma <aaron.ma at canonical.com>
>>> ---
>>> .../intel/common/soc-acpi-intel-arl-match.c | 219
>>> ++++++++++++++++++
>>> 1 file changed, 219 insertions(+)
>>>
>>> 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 a0331ada2d487..905330682b456 100644
>>> --- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
>>> +++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
>>> @@ -40,6 +40,112 @@ static const struct snd_soc_acpi_endpoint
>>> rt722_endpoints[] = {
>>> },
>>> };
>>> +static const struct snd_soc_acpi_endpoint spk_l_endpoint = {
>>> + .num = 0,
>>> + .aggregated = 1,
>>> + .group_position = 0,
>>> + .group_id = 1,
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
>>> + .num = 0,
>>> + .aggregated = 1,
>>> + .group_position = 1,
>>> + .group_id = 1,
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_endpoint spk_2_endpoint = {
>>> + .num = 0,
>>> + .aggregated = 1,
>>> + .group_position = 2,
>>> + .group_id = 1,
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_endpoint spk_3_endpoint = {
>>> + .num = 0,
>>> + .aggregated = 1,
>>> + .group_position = 3,
>>> + .group_id = 1,
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_adr_device cs35l56_2_lr_adr[] = {
>>> + {
>>> + .adr = 0x00023001FA355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_l_endpoint,
>>> + .name_prefix = "AMP1"
>>> + },
>>> + {
>>> + .adr = 0x00023101FA355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_r_endpoint,
>>> + .name_prefix = "AMP2"
>>> + }
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_adr_device cs35l56_3_lr_adr[] = {
>>> + {
>>> + .adr = 0x00033001FA355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_l_endpoint,
>>> + .name_prefix = "AMP1"
>>> + },
>>> + {
>>> + .adr = 0x00033401FA355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_r_endpoint,
>>> + .name_prefix = "AMP2"
>>> + }
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_adr_device cs35l56_2_r_adr[] = {
>>> + {
>>> + .adr = 0x00023201FA355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_r_endpoint,
>>> + .name_prefix = "AMP3"
>>> + },
>>> + {
>>> + .adr = 0x00023301FA355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_3_endpoint,
>>> + .name_prefix = "AMP4"
>>> + }
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_adr_device cs35l56_3_l_adr[] = {
>>> + {
>>> + .adr = 0x00033001fa355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_l_endpoint,
>>> + .name_prefix = "AMP1"
>>> + },
>>> + {
>>> + .adr = 0x00033101fa355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_2_endpoint,
>>> + .name_prefix = "AMP2"
>>> + }
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_adr_device cs35l56_2_r1_adr[] = {
>>> + {
>>> + .adr = 0x00023101FA355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_r_endpoint,
>>> + .name_prefix = "AMP2"
>>> + },
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_adr_device cs35l56_3_l1_adr[] = {
>>> + {
>>> + .adr = 0x00033301fa355601ull,
>>> + .num_endpoints = 1,
>>> + .endpoints = &spk_l_endpoint,
>>> + .name_prefix = "AMP1"
>>> + },
>>> +};
>>> +
>>> static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
>>> { /* Jack Playback Endpoint */
>>> .num = 0,
>>> @@ -76,6 +182,15 @@ static const struct snd_soc_acpi_adr_device
>>> cs42l43_0_adr[] = {
>>> }
>>> };
>>> +static const struct snd_soc_acpi_adr_device cs42l43_2_adr[] = {
>>> + {
>>> + .adr = 0x00023001FA424301ull,
>>> + .num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
>>> + .endpoints = cs42l43_endpoints,
>>> + .name_prefix = "cs42l43"
>>> + }
>>> +};
>>> +
>>> static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
>>> {
>>> .adr = 0x000020025D071100ull,
>>> @@ -120,6 +235,80 @@ static const struct snd_soc_acpi_link_adr
>>> arl_cs42l43_l0[] = {
>>> },
>>> };
>>> +static const struct snd_soc_acpi_link_adr arl_cs42l43_l2[] = {
>>> + {
>>> + .mask = BIT(2),
>>> + .num_adr = ARRAY_SIZE(cs42l43_2_adr),
>>> + .adr_d = cs42l43_2_adr,
>>> + },
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_link_adr
>>> arl_cs42l43_l2_cs35l56_l3[] = {
>>> + {
>>> + .mask = BIT(2),
>>> + .num_adr = ARRAY_SIZE(cs42l43_2_adr),
>>> + .adr_d = cs42l43_2_adr,
>>> + },
>>> + {
>>> + .mask = BIT(3),
>>> + .num_adr = ARRAY_SIZE(cs35l56_3_lr_adr),
>>> + .adr_d = cs35l56_3_lr_adr,
>>> + },
>>> + {}
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_link_adr
>>> arl_cs42l43_l0_cs35l56_l2[] = {
>>> + {
>>> + .mask = BIT(0),
>>> + .num_adr = ARRAY_SIZE(cs42l43_0_adr),
>>> + .adr_d = cs42l43_0_adr,
>>> + },
>>> + {
>>> + .mask = BIT(2),
>>> + .num_adr = ARRAY_SIZE(cs35l56_2_lr_adr),
>>> + .adr_d = cs35l56_2_lr_adr,
>>> + },
>>> + {}
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_link_adr
>>> arl_cs42l43_l0_cs35l56_l23[] = {
>>> + {
>>> + .mask = BIT(0),
>>> + .num_adr = ARRAY_SIZE(cs42l43_0_adr),
>>> + .adr_d = cs42l43_0_adr,
>>> + },
>>> + {
>>> + .mask = BIT(2),
>>> + .num_adr = ARRAY_SIZE(cs35l56_2_r_adr),
>>> + .adr_d = cs35l56_2_r_adr,
>>> + },
>>> + {
>>> + .mask = BIT(3),
>>> + .num_adr = ARRAY_SIZE(cs35l56_3_l_adr),
>>> + .adr_d = cs35l56_3_l_adr,
>>> + },
>>> + {}
>>> +};
>>> +
>>> +static const struct snd_soc_acpi_link_adr
>>> arl_cs42l43_l0_cs35l56_2_l23[] = {
>>> + {
>>> + .mask = BIT(0),
>>> + .num_adr = ARRAY_SIZE(cs42l43_0_adr),
>>> + .adr_d = cs42l43_0_adr,
>>> + },
>>> + {
>>> + .mask = BIT(2),
>>> + .num_adr = ARRAY_SIZE(cs35l56_2_r1_adr),
>>> + .adr_d = cs35l56_2_r1_adr,
>>> + },
>>> + {
>>> + .mask = BIT(3),
>>> + .num_adr = ARRAY_SIZE(cs35l56_3_l1_adr),
>>> + .adr_d = cs35l56_3_l1_adr,
>>> + },
>>> + {}
>>> +};
>>> +
>>> static const struct snd_soc_acpi_link_adr arl_rvp[] = {
>>> {
>>> .mask = BIT(0),
>>> @@ -159,12 +348,42 @@
>>> EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_arl_machines);
>>> /* this table is used when there is no I2S codec present */
>>> struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
>>> + {
>>> + .link_mask = BIT(0) | BIT(2) | BIT(3),
>>> + .links = arl_cs42l43_l0_cs35l56_l23,
>>> + .drv_name = "sof_sdw",
>>> + .sof_tplg_filename = "sof-arl-cs42l43-l0-cs35l56-l23.tplg",
>>> + },
>>> + {
>>> + .link_mask = BIT(0) | BIT(2) | BIT(3),
>>> + .links = arl_cs42l43_l0_cs35l56_2_l23,
>>> + .drv_name = "sof_sdw",
>>> + .sof_tplg_filename = "sof-arl-cs42l43-l0-cs35l56-l23.tplg",
>>> + },
>>> + {
>>> + .link_mask = BIT(0) | BIT(2),
>>> + .links = arl_cs42l43_l0_cs35l56_l2,
>>> + .drv_name = "sof_sdw",
>>> + .sof_tplg_filename = "sof-arl-cs42l43-l0-cs35l56-l2.tplg",
>>> + },
>>> {
>>> .link_mask = BIT(0),
>>> .links = arl_cs42l43_l0,
>>> .drv_name = "sof_sdw",
>>> .sof_tplg_filename = "sof-arl-cs42l43-l0.tplg",
>>> },
>>> + {
>>> + .link_mask = BIT(2),
>>> + .links = arl_cs42l43_l2,
>>> + .drv_name = "sof_sdw",
>>> + .sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
>>> + },
>>> + {
>>> + .link_mask = BIT(2) | BIT(3),
>>> + .links = arl_cs42l43_l2_cs35l56_l3,
>>> + .drv_name = "sof_sdw",
>>> + .sof_tplg_filename = "sof-arl-cs42l43-l2-cs35l56-l3.tplg",
>>> + },
>>> {
>>> .link_mask = 0x1, /* link0 required */
>>> .links = arl_rvp,
>>
>> The patches are fine, but for future, please send all reworks as a
>> new series, with it's own cover letter, not sent in-reply-to the
>> previous series, and marked with a version so v2/v3 and so on.
>
>
> It's a new series with "v2" in cover letter subject..
Ok, sorry about that, my mailing client does not show a cover letter for
this series. But then again I think v2 has to be in each individual
PATCH too.
>
> Aaron>
>> Acked-by: Kuba Pawlak <kuba.pawlak at canonical.com>
>>
>>
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0x216A9D7E3B63DCB4.asc
Type: application/pgp-keys
Size: 3139 bytes
Desc: OpenPGP public key
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20250415/00fca8ee/attachment-0001.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20250415/00fca8ee/attachment-0001.sig>
More information about the kernel-team
mailing list