Skip to contentSkip to conversation

ASoC: SDCA: Add RJ support to class driver

PATCH In review Charles Keepax 2 participants 2 messages Mar 27 – Apr 3

Subsystems (3)
lore
Share & tools
lore

Charles Keepax

author maintainer
#0 lore raw

PATCH 1/1 ASoC: SDCA: Add RJ support to class driver

Add the retaskable jack Function to the list of Functions supported by the class driver, it shouldn't require anything that isn't already supported.

---
 sound/soc/sdca/sdca_class_function.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
sound/soc/sdca/sdca_class_function.c +11 -1
index 98fd3fd1052b4..c3eb3c23a7db9 100644
@@ -368,8 +368,14 @@ static int class_function_probe(struct auxiliary_device *auxdev,
 		return dev_err_probe(dev, PTR_ERR(drv->regmap),
 				     "failed to create regmap");
 
-	if (desc->type == SDCA_FUNCTION_TYPE_UAJ)
+	switch (desc->type) {
+	case SDCA_FUNCTION_TYPE_UAJ:
+	case SDCA_FUNCTION_TYPE_RJ:
 		cmp_drv->set_jack = class_function_set_jack;
+		break;
+	default:
+		break;
+	}
 
 	ret = sdca_asoc_populate_component(dev, drv->function, cmp_drv,
 					   &dais, &num_dais,
@@ -539,6 +545,10 @@ static const struct auxiliary_device_id class_function_id_table[] = {
 		.name = "snd_soc_sdca." SDCA_FUNCTION_TYPE_HID_NAME,
 		.driver_data = SDCA_FUNCTION_TYPE_HID,
 	},
+	{
+		.name = "snd_soc_sdca." SDCA_FUNCTION_TYPE_RJ_NAME,
+		.driver_data = SDCA_FUNCTION_TYPE_RJ,
+	},
 	{},
 };
 MODULE_DEVICE_TABLE(auxiliary, class_function_id_table);
Signature · 1 line
2.47.3
maintainer
#1 lore raw
Quoted 1 line · Charles Keepax

ASoC: SDCA: Add RJ support to class driver

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.1

Thanks!

[1/1] ASoC: SDCA: Add RJ support to class driver

      https://git.kernel.org/broonie/sound/c/9557ec3f9c9f

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