ASoC: amd: acp: Add SOF audio support on Chrome board
authorAjit Kumar Pandey <AjitKumar.Pandey@amd.com>
Tue, 19 Oct 2021 07:09:36 +0000 (12:39 +0530)
committerMark Brown <broonie@kernel.org>
Wed, 20 Oct 2021 10:12:55 +0000 (11:12 +0100)
Chrome board has RT5682 codec and RT1019 amp connected to I2S SP
controller on ACP hw. Also it support DMIC capture endpoints with
inbuilt pdm controller on ACP hw block. Add driver module to create
backend dai links for sof dsp core. We pass driver data with audio
end points configuration to register sound cards and create device
nodes for all audio endpoints.

Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
Link: https://lore.kernel.org/r/20211019070938.5076-7-AjitKumar.Pandey@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/acp/Kconfig
sound/soc/amd/acp/Makefile
sound/soc/amd/acp/acp-sof-mach.c [new file with mode: 0644]

index d8d49d0..f03af79 100644 (file)
@@ -41,3 +41,9 @@ config SND_SOC_AMD_LEGACY_MACH
        select SND_SOC_AMD_MACH_COMMON
        help
          This option enables legacy sound card support for ACP audio.
+
+config SND_SOC_AMD_SOF_MACH
+       tristate "AMD SOF Machine Driver Support"
+       select SND_SOC_AMD_MACH_COMMON
+       help
+         This option enables SOF sound card support for ACP audio.
index aef6f98..16c144c 100644 (file)
@@ -14,6 +14,7 @@ snd-acp-renoir-objs     := acp-renoir.o
 #machine specific driver
 snd-acp-mach-objs     := acp-mach-common.o
 snd-acp-legacy-mach-objs     := acp-legacy-mach.o
+snd-acp-sof-mach-objs     := acp-sof-mach.o
 
 obj-$(CONFIG_SND_SOC_AMD_ACP_PCM) += snd-acp-pcm.o
 obj-$(CONFIG_SND_SOC_AMD_ACP_I2S) += snd-acp-i2s.o
@@ -22,3 +23,4 @@ obj-$(CONFIG_SND_AMD_ASOC_RENOIR) += snd-acp-renoir.o
 
 obj-$(CONFIG_SND_SOC_AMD_MACH_COMMON) += snd-acp-mach.o
 obj-$(CONFIG_SND_SOC_AMD_LEGACY_MACH) += snd-acp-legacy-mach.o
+obj-$(CONFIG_SND_SOC_AMD_SOF_MACH) += snd-acp-sof-mach.o
diff --git a/sound/soc/amd/acp/acp-sof-mach.c b/sound/soc/amd/acp/acp-sof-mach.c
new file mode 100644 (file)
index 0000000..e143aa2
--- /dev/null
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license. When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2021 Advanced Micro Devices, Inc.
+//
+// Authors: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
+//
+
+/*
+ * SOF Machine Driver Support for ACP HW block
+ */
+
+#include <sound/core.h>
+#include <sound/pcm_params.h>
+#include <sound/soc-acpi.h>
+#include <sound/soc-dapm.h>
+#include <linux/module.h>
+
+#include "acp-mach.h"
+
+static struct acp_card_drvdata sof_rt5682_rt1019_data = {
+       .hs_cpu_id = I2S_SP,
+       .amp_cpu_id = I2S_SP,
+       .dmic_cpu_id = DMIC,
+       .hs_codec_id = RT5682,
+       .amp_codec_id = RT1019,
+       .dmic_codec_id = DMIC,
+};
+
+static const struct snd_kcontrol_new acp_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Headphone Jack"),
+       SOC_DAPM_PIN_SWITCH("Headset Mic"),
+       SOC_DAPM_PIN_SWITCH("Spk"),
+       SOC_DAPM_PIN_SWITCH("Left Spk"),
+       SOC_DAPM_PIN_SWITCH("Right Spk"),
+};
+
+static const struct snd_soc_dapm_widget acp_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone Jack", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+       SND_SOC_DAPM_SPK("Spk", NULL),
+       SND_SOC_DAPM_SPK("Left Spk", NULL),
+       SND_SOC_DAPM_SPK("Right Spk", NULL),
+};
+
+static int acp_sof_probe(struct platform_device *pdev)
+{
+       struct snd_soc_card *card = NULL;
+       struct device *dev = &pdev->dev;
+       int ret;
+
+       if (!pdev->id_entry)
+               return -EINVAL;
+
+       card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+       if (!card)
+               return -ENOMEM;
+
+       card->dev = dev;
+       card->owner = THIS_MODULE;
+       card->name = pdev->id_entry->name;
+       card->dapm_widgets = acp_widgets;
+       card->num_dapm_widgets = ARRAY_SIZE(acp_widgets);
+       card->controls = acp_controls;
+       card->num_controls = ARRAY_SIZE(acp_controls);
+       card->drvdata = (struct acp_card_drvdata *)pdev->id_entry->driver_data;
+
+       acp_sofdsp_dai_links_create(card);
+
+       ret = devm_snd_soc_register_card(&pdev->dev, card);
+       if (ret) {
+               dev_err(&pdev->dev,
+                               "devm_snd_soc_register_card(%s) failed: %d\n",
+                               card->name, ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static const struct platform_device_id board_ids[] = {
+       {
+               .name = "rt5682-rt1019",
+               .driver_data = (kernel_ulong_t)&sof_rt5682_rt1019_data
+       },
+       { }
+};
+static struct platform_driver acp_asoc_audio = {
+       .driver = {
+               .name = "sof_mach",
+       },
+       .probe = acp_sof_probe,
+       .id_table = board_ids,
+};
+
+module_platform_driver(acp_asoc_audio);
+
+MODULE_IMPORT_NS(SND_SOC_AMD_MACH);
+MODULE_DESCRIPTION("ACP chrome SOF audio support");
+MODULE_ALIAS("platform:rt5682-rt1019");
+MODULE_LICENSE("GPL v2");