ASoC: Intel: avs: Add DMIC machine board

Support AVS-DMIC configuration by implementing board connecting AVS
platform component with DMIC codec one.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220511162403.3987658-5-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/boards/Kconfig b/sound/soc/intel/avs/boards/Kconfig
index de62c0437f6ed1c094983e2e9ee2d518196b9fb3..1d4597fa9814ab322861f0ed8b807638d6348058 100644 (file)
--- a/sound/soc/intel/avs/boards/Kconfig
+++ b/sound/soc/intel/avs/boards/Kconfig
@@ -4,6 +4,14 @@ menu "Intel AVS Machine drivers"
 
 comment "Available DSP configurations"
 
+config SND_SOC_INTEL_AVS_MACH_DMIC
+       tristate "DMIC generic board"
+       select SND_SOC_DMIC
+       help
+         This adds support for AVS with Digital Mic array configuration.
+         Say Y or m if you have such a device. This is a recommended option.
+         If unsure select "N".
+
 config SND_SOC_INTEL_AVS_MACH_HDAUDIO
        tristate "HD-Audio generic board"
        select SND_SOC_HDA

diff --git a/sound/soc/intel/avs/boards/Makefile b/sound/soc/intel/avs/boards/Makefile
index e5281148e5d4bdd64ee79b909a0e672b3bdc3a3a..2ff35d4d97d8d41ff3e8c1d3152cfd5cc20da28e 100644 (file)
--- a/sound/soc/intel/avs/boards/Makefile
+++ b/sound/soc/intel/avs/boards/Makefile
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+snd-soc-avs-dmic-objs := dmic.o
 snd-soc-avs-hdaudio-objs := hdaudio.o
 
+obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC) += snd-soc-avs-dmic.o
 obj-$(CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO) += snd-soc-avs-hdaudio.o

diff --git a/sound/soc/intel/avs/boards/dmic.c b/sound/soc/intel/avs/boards/dmic.c
new file mode 100644 (file)
index 0000000..90a9216
--- /dev/null
+++ b/sound/soc/intel/avs/boards/dmic.c
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0-only
+//
+// Copyright(c) 2021-2022 Intel Corporation. All rights reserved.
+//
+// Authors: Cezary Rojewski <cezary.rojewski@intel.com>
+//          Amadeusz Slawinski <amadeuszx.slawinski@linux.intel.com>
+//
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <sound/soc.h>
+#include <sound/soc-acpi.h>
+
+SND_SOC_DAILINK_DEF(dmic_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));
+SND_SOC_DAILINK_DEF(dmic_wov_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC WoV Pin")));
+SND_SOC_DAILINK_DEF(dmic_codec, DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));
+/* Name overridden on probe */
+SND_SOC_DAILINK_DEF(platform, DAILINK_COMP_ARRAY(COMP_PLATFORM("")));
+
+static struct snd_soc_dai_link card_dai_links[] = {
+       /* Back ends */
+       {
+               .name = "DMIC",
+               .id = 0,
+               .dpcm_capture = 1,
+               .nonatomic = 1,
+               .no_pcm = 1,
+               SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
+       },
+       {
+               .name = "DMIC WoV",
+               .id = 1,
+               .dpcm_capture = 1,
+               .nonatomic = 1,
+               .no_pcm = 1,
+               .ignore_suspend = 1,
+               SND_SOC_DAILINK_REG(dmic_wov_pin, dmic_codec, platform),
+       },
+};
+
+static const struct snd_soc_dapm_widget card_widgets[] = {
+       SND_SOC_DAPM_MIC("SoC DMIC", NULL),
+};
+
+static const struct snd_soc_dapm_route card_routes[] = {
+       {"DMic", NULL, "SoC DMIC"},
+       {"DMIC Rx", NULL, "Capture"},
+       {"DMIC WoV Rx", NULL, "Capture"},
+};
+
+static int avs_dmic_probe(struct platform_device *pdev)
+{
+       struct snd_soc_acpi_mach *mach;
+       struct snd_soc_card *card;
+       struct device *dev = &pdev->dev;
+       int ret;
+
+       mach = dev_get_platdata(dev);
+
+       card = devm_kzalloc(dev, sizeof(*card), GFP_KERNEL);
+       if (!card)
+               return -ENOMEM;
+
+       card->name = "avs_dmic";
+       card->dev = dev;
+       card->owner = THIS_MODULE;
+       card->dai_link = card_dai_links;
+       card->num_links = ARRAY_SIZE(card_dai_links);
+       card->dapm_widgets = card_widgets;
+       card->num_dapm_widgets = ARRAY_SIZE(card_widgets);
+       card->dapm_routes = card_routes;
+       card->num_dapm_routes = ARRAY_SIZE(card_routes);
+       card->fully_routed = true;
+
+       ret = snd_soc_fixup_dai_links_platform_name(card, mach->mach_params.platform);
+       if (ret)
+               return ret;
+
+       return devm_snd_soc_register_card(dev, card);
+}
+
+static struct platform_driver avs_dmic_driver = {
+       .probe = avs_dmic_probe,
+       .driver = {
+               .name = "avs_dmic",
+               .pm = &snd_soc_pm_ops,
+       },
+};
+
+module_platform_driver(avs_dmic_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:avs_dmic");