github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SDCA: Allow naming of imp def controls

Browse Source 
Implementation defined controls will not be present in the large list of
known controls for SDCA. The driver should not return an error for these,
because it is perfectly legal to have implementation defined controls.
Update the handling to instead generate a generic name.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250312172205.4152686-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2025-03-12 17:22:02 +00:00 committed by Mark Brown
parent 0d16daa940
commit 49680c9f13
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/sdca/sdca_functions.c
View File

@ -241,7 +241,8 @@ static int find_sdca_init_table(struct device *dev,
return 0;
}
static const char *find_sdca_control_label(const struct sdca_entity *entity,
static const char *find_sdca_control_label(struct device *dev,
const struct sdca_entity *entity,
const struct sdca_control *control)
{
switch (SDCA_CTL_TYPE(entity->type, control->sel)) {
@ -530,7 +531,7 @@ static const char *find_sdca_control_label(const struct sdca_entity *entity,
case SDCA_CTL_TYPE_S(ENTITY_0, DEVICE_SDCA_VERSION):
return SDCA_CTL_DEVICE_SDCA_VERSION_NAME;
default:
return NULL;
return devm_kasprintf(dev, GFP_KERNEL, "Imp-Def %#x", control->sel);
}
}
@ -739,12 +740,9 @@ static int find_sdca_entity_control(struct device *dev, struct sdca_entity *enti
if (!ret)
control->interrupt_position = tmp;
control->label = find_sdca_control_label(entity, control);
if (!control->label) {
dev_err(dev, "%s: control %#x: name not found\n",
entity->label, control->sel);
return -EINVAL;
}
control->label = find_sdca_control_label(dev, entity, control);
if (!control->label)
return -ENOMEM;
control->nbits = find_sdca_control_bits(entity, control);