Skip to content

ASoC: Intel: soc-acpi-intel-lnl-match: add cs42l43 6x cs35l56 support#5331

Merged
bardliao merged 2 commits intothesofproject:topic/sof-devfrom
bardliao:cirrus-aioc3
Feb 26, 2025
Merged

ASoC: Intel: soc-acpi-intel-lnl-match: add cs42l43 6x cs35l56 support#5331
bardliao merged 2 commits intothesofproject:topic/sof-devfrom
bardliao:cirrus-aioc3

Conversation

@bardliao
Copy link
Collaborator

This add a match for cs42l43 on sdw link 2, 3 cs35l56 on sdw link 1 and
3. All speakers are aggregated.

@bardliao
Copy link
Collaborator Author

@simontrimmer @rfvirgil I vaguely remember that you have a naming rule for acpi adr devices but I can't find it. Could you correct me if cs35l56_1_3amp_adr[] against the naming rule?

lgirdwood
lgirdwood previously approved these changes Feb 18, 2025
@simontrimmer
Copy link
Collaborator

Hi @bardliao I think the naming convention recollection you may be thinking of was this one:

commit a3003af
Author: Simon Trimmer simont@opensource.cirrus.com
Date: Fri Dec 6 15:59:02 2024 +0800

ASoC: Intel: soc-acpi: arl: Correct naming of a cs35l56 address struct

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>

Will have a look at the naming in a mo
-Simon

},
};

static const struct snd_soc_acpi_endpoint cs42l43_amp_spkagg_ndpoints[] = {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cs42l43_amp_spkagg_ndpoints -> cs42l43_amp_spkagg_endpoints ?

This add a match for cs42l43 on sdw link 2, 3 cs35l56 on sdw link 1 and
3. All speakers are aggregated.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
This add a match for cs42l43 on sdw link 2, 3 cs35l56 on sdw link 1 and
3. All speakers are aggregated.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
@bardliao
Copy link
Collaborator Author

@simontrimmer Does it look good now?

@simontrimmer
Copy link
Collaborator

Hi @bardliao I don't have one of those boards but yes looks good to me!

@bardliao bardliao merged commit 99ec8ef into thesofproject:topic/sof-dev Feb 26, 2025
11 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants