ASoC: SDCA: Add companion amp Function
Subsystems (3)
Charles Keepax
maintainerPATCH 1/1 ASoC: SDCA: Add companion amp Function
Add companion amp into the list of allowed SDCA Functions. More work will be required to fully support companion amp, but this will let parts including companion amp functions boot and it is a good first step to proper support.
--- include/sound/sdca_function.h | 3 +++ sound/soc/sdca/sdca_functions.c | 2 ++ 2 files changed, 5 insertions(+)
include/sound/sdca_function.h +3 -0
@@ -64,6 +64,7 @@ struct sdca_function_desc;* @SDCA_FUNCTION_TYPE_RJ: Retaskable jack. * @SDCA_FUNCTION_TYPE_SIMPLE_JACK: Subset of UAJ. * @SDCA_FUNCTION_TYPE_HID: Human Interface Device, for e.g. buttons. +* @SDCA_FUNCTION_TYPE_COMPANION_AMP: Sources audio from another amp. * @SDCA_FUNCTION_TYPE_IMP_DEF: Implementation-defined function. * * SDCA Function Types from SDCA specification v1.0a Section 5.1.2
@@ -83,6 +84,7 @@ enum sdca_function_type {SDCA_FUNCTION_TYPE_RJ =0x07 ,SDCA_FUNCTION_TYPE_SIMPLE_JACK =0x08 ,SDCA_FUNCTION_TYPE_HID =0x0A , +SDCA_FUNCTION_TYPE_COMPANION_AMP =0x0B , SDCA_FUNCTION_TYPE_IMP_DEF = 0x1F, };
@@ -96,6 +98,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_COMPANION_AMP_NAME "CompanionAmp"#define SDCA_FUNCTION_TYPE_IMP_DEF_NAME "ImplementationDefined"/**
sound/soc/sdca/sdca_functions.c +2 -0
@@ -79,6 +79,8 @@ static const char *get_sdca_function_name(u32 function_type)return SDCA_FUNCTION_TYPE_SPEAKER_MIC_NAME ;case SDCA_FUNCTION_TYPE_RJ :return SDCA_FUNCTION_TYPE_RJ_NAME ; +case SDCA_FUNCTION_TYPE_COMPANION_AMP : +return SDCA_FUNCTION_TYPE_COMPANION_AMP_NAME ;case SDCA_FUNCTION_TYPE_IMP_DEF :return SDCA_FUNCTION_TYPE_IMP_DEF_NAME ;default :
Signature · 1 line
2.47.3
Quoted 10 lines · Charles Keepax
Add companion amp into the list of allowed SDCA Functions. More work will be required to fully support companion amp, but this will let parts including companion amp functions boot and it is a good first step to proper support.
Signed-off-by Charles Keepax <[email protected]>--- include/sound/sdca_function.h | 3 +++ sound/soc/sdca/sdca_functions.c | 2 ++ 2 files changed, 5 insertions(+)
Mark Brown
maintainerQuoted 6 lines · Charles Keepax
Add companion amp into the list of allowed SDCA Functions. More work will be required to fully support companion amp, but this will let parts including companion amp functions boot and it is a good first step to proper support.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SDCA: Add companion amp Function
commit: f5cb3ee251b4f9db2761aced191f10579bd7e64e
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark