github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: SDCA: Add missing function type names

Browse Source 
It is not helpful to error out on some SDCA function types, we
might as well report the correct name and let the driver core
simply not bind a driver to those functions for which the code
lacks support. Also given no functions currently have support,
it seems odd to select some as unsupported.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20241220173516.907406-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2024-12-20 17:35:15 +00:00 committed by Mark Brown
parent c36297b1bd
commit c1ed5eb13f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/sdca_function.h
View File

@ -42,6 +42,7 @@ enum sdca_function_type {
#define SDCA_FUNCTION_TYPE_RJ_NAME "RJ"
#define SDCA_FUNCTION_TYPE_SIMPLE_NAME "SimpleJack"
#define SDCA_FUNCTION_TYPE_HID_NAME "HID"
#define SDCA_FUNCTION_TYPE_IMP_DEF_NAME "ImplementationDefined"
enum sdca_entity0_controls {
SDCA_CONTROL_ENTITY_0_COMMIT_GROUP_MASK = 0x01,

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

@ -75,12 +75,20 @@ static int patch_sdca_function_type(struct device *dev,
*function_name = SDCA_FUNCTION_TYPE_HID_NAME;
break;
case SDCA_FUNCTION_TYPE_SIMPLE_AMP:
*function_name = SDCA_FUNCTION_TYPE_SIMPLE_AMP_NAME;
break;
case SDCA_FUNCTION_TYPE_SIMPLE_MIC:
*function_name = SDCA_FUNCTION_TYPE_SIMPLE_MIC_NAME;
break;
case SDCA_FUNCTION_TYPE_SPEAKER_MIC:
*function_name = SDCA_FUNCTION_TYPE_SPEAKER_MIC_NAME;
break;
case SDCA_FUNCTION_TYPE_RJ:
*function_name = SDCA_FUNCTION_TYPE_RJ_NAME;
break;
case SDCA_FUNCTION_TYPE_IMP_DEF:
dev_warn(dev, "unsupported SDCA function type %d\n", *function_type);
return -EINVAL;
*function_name = SDCA_FUNCTION_TYPE_IMP_DEF_NAME;
break;
default:
dev_err(dev, "invalid SDCA function type %d\n", *function_type);
return -EINVAL;