github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: soc_sdw_utils: skip aux device if it is not present

Browse Source 
Bard Liao <yung-chuan.liao@linux.intel.com> says:

ASoC: soc_sdw_utils: skip aux device if it is not present

Similarly to codec endpoints that may not be used [1], aux devices (like
HID) also may not be used. Hence skip aux devices which are not present.

Also update the comment above is_sdca_endpoint_present().

[1] https://lore.kernel.org/all/20250414063239.85200-12-yung-chuan.liao@linux.intel.com/

Link: https://patch.msgid.link/20260508094750.1246796-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Mark Brown 2026-05-11 10:05:36 +09:00
commit 56ba969925
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 77 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
sound/soc/sdw_utils/soc_sdw_utils.c
View File

@ -1704,6 +1704,63 @@ int asoc_sdw_init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *d
}
EXPORT_SYMBOL_NS(asoc_sdw_init_simple_dai_link, "SND_SOC_SDW_UTILS");
/**
* is_sdca_aux_dev_present - Check if an SDCA aux device is present on the SDW peripheral
* @dev: Device pointer
* @aux_codec_name: Aux codec name from the codec info (e.g. "snd_soc_sdca.HID.2")
* @adr_link: ACPI link address
* @adr_index: Index of the ACPI link address
*
* Return: 1 if the aux is present, 0 if the aux is not present, or negative error code.
*/
static int is_sdca_aux_dev_present(struct device *dev,
const char *aux_codec_name,
const struct snd_soc_acpi_link_adr *adr_link,
int adr_index)
{
struct sdw_slave *slave;
struct device *sdw_dev;
const char *sdw_codec_name;
int ret = 0;
int i;
if (!aux_codec_name)
return 0;
sdw_codec_name = _asoc_sdw_get_codec_name(dev, adr_link, adr_index);
if (!sdw_codec_name)
return -ENOMEM;
sdw_dev = bus_find_device_by_name(&sdw_bus_type, NULL, sdw_codec_name);
if (!sdw_dev) {
dev_err(dev, "codec %s not found\n", sdw_codec_name);
return -EINVAL;
}
slave = dev_to_sdw_dev(sdw_dev);
if (!slave->sdca_data.interface_revision) {
dev_warn(dev, "No SDCA properties, assuming aux '%s' present\n", aux_codec_name);
ret = 1;
goto put_dev;
}
for (i = 0; i < slave->sdca_data.num_functions; i++) {
const char *fname = slave->sdca_data.function[i].name;
if (fname && strstr(aux_codec_name, fname)) {
ret = 1;
goto put_dev;
}
}
dev_dbg(dev, "SDCA function for aux '%s' NOT FOUND on slave, skipping\n", aux_codec_name);
put_dev:
put_device(sdw_dev);
return ret;
}
int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card,
int *num_devs, int *num_ends, int *num_aux)
{
@ -1711,7 +1768,7 @@ int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card,
struct snd_soc_acpi_mach *mach = dev_get_platdata(dev);
struct snd_soc_acpi_mach_params *mach_params = &mach->mach_params;
const struct snd_soc_acpi_link_adr *adr_link;
int i;
int i, j, ret;
for (adr_link = mach_params->links; adr_link->num_adr; adr_link++) {
*num_devs += adr_link->num_adr;
@ -1726,7 +1783,14 @@ int asoc_sdw_count_sdw_endpoints(struct snd_soc_card *card,
if (!codec_info)
return -EINVAL;
*num_aux += codec_info->aux_num;
for (j = 0; j < codec_info->aux_num; j++) {
ret = is_sdca_aux_dev_present(dev, codec_info->auxs[j].codec_name,
adr_link, i);
if (ret < 0)
return ret;
if (ret)
(*num_aux)++;
}
}
}
@ -1775,20 +1839,16 @@ int asoc_sdw_get_dai_type(u32 type)
}
EXPORT_SYMBOL_NS(asoc_sdw_get_dai_type, "SND_SOC_SDW_UTILS");
/*
* Check if the SDCA endpoint is present by the SDW peripheral
*
/**
* is_sdca_endpoint_present - Check if an SDCA endpoint is present on the SDW peripheral
* @dev: Device pointer
* @codec_info: Codec info pointer
* @adr_link: ACPI link address
* @adr_index: Index of the ACPI link address
* @end_index: Index of the endpoint
*
* Return: 1 if the endpoint is present,
* 0 if the endpoint is not present,
* negative error code.
* Return: 1 if the endpoint is present, 0 if the endpoint is not present, or negative error code.
*/
static int is_sdca_endpoint_present(struct device *dev,
struct asoc_sdw_codec_info *codec_info,
const struct snd_soc_acpi_link_adr *adr_link,
@ -1890,6 +1950,14 @@ int asoc_sdw_parse_sdw_endpoints(struct snd_soc_card *card,
for (j = 0; j < codec_info->aux_num; j++) {
struct snd_soc_component *component;
ret = is_sdca_aux_dev_present(dev, codec_info->auxs[j].codec_name,
adr_link, i);
if (ret < 0)
return ret;
if (ret == 0)
continue;
component = snd_soc_lookup_component_by_name(codec_info->auxs[j].codec_name);
if (component) {
dev_dbg(dev, "%s found component %s for aux name %s\n",