Change in coreboot[master]: soc/intel/skylake: Support NHLT 1ch DMIC

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43072 )

Change subject: soc/intel/skylake: Support NHLT 1ch DMIC
......................................................................

soc/intel/skylake: Support NHLT 1ch DMIC

Allows advertising support for a 1ch array DMIC in the NHLT table.
Boards use the NHLT if a microphone is connected to the DSP.

Tested on an Acer Aspire VN7-572G (Skylake-U) on Windows 10.
A custom ALSA topology will be required for Linux.

Change-Id: Idba3a714faab5ca1958de7dcfc0fc667c60ea7fd
Signed-off-by: Benjamin Doron 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43072
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
---
M src/soc/intel/skylake/Kconfig
M src/soc/intel/skylake/nhlt/Makefile.inc
M src/soc/intel/skylake/nhlt/dmic.c
3 files changed, 47 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index ed81e24..ba3af84 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -161,6 +161,12 @@
    help
      Choose this option if you have a PCH-H chipset.

+config NHLT_DMIC_1CH
+	bool
+	default n
+	help
+	  Include DSP firmware settings for 1 channel DMIC array.
+
 config NHLT_DMIC_2CH
    bool
    default n
diff --git a/src/soc/intel/skylake/nhlt/Makefile.inc b/src/soc/intel/skylake/nhlt/Makefile.inc
index 5c8bd80..7596492 100644
--- a/src/soc/intel/skylake/nhlt/Makefile.inc
+++ b/src/soc/intel/skylake/nhlt/Makefile.inc
@@ -15,6 +15,7 @@
 NHLT_BLOB_PATH = 3rdparty/blobs/soc/intel/skylake/nhlt-blobs
 endif

+DMIC_1CH_48KHZ_16B = dmic-1ch-48khz-16b.bin
 DMIC_2CH_48KHZ_16B = dmic-2ch-48khz-16b.bin
 DMIC_2CH_48KHZ_32B = dmic-2ch-48khz-32b.bin
 DMIC_4CH_48KHZ_16B = dmic-4ch-48khz-16b.bin
@@ -31,6 +32,10 @@
 SSM4567_CAPTURE = ssm4567-capture-4ch-48khz-32b.bin
 DA7219_RENDER_CAPTURE = dialog-2ch-48khz-24b.bin

+cbfs-files-$(CONFIG_NHLT_DMIC_1CH) += $(DMIC_1CH_48KHZ_16B)
+$(DMIC_1CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(DMIC_1CH_48KHZ_16B)
+$(DMIC_1CH_48KHZ_16B)-type := raw
+
 cbfs-files-$(CONFIG_NHLT_DMIC_2CH) += $(DMIC_2CH_48KHZ_16B)
 $(DMIC_2CH_48KHZ_16B)-file := $(NHLT_BLOB_PATH)/$(DMIC_2CH_48KHZ_16B)
 $(DMIC_2CH_48KHZ_16B)-type := raw
diff --git a/src/soc/intel/skylake/nhlt/dmic.c b/src/soc/intel/skylake/nhlt/dmic.c
index 76c1990..b8802a6 100644
--- a/src/soc/intel/skylake/nhlt/dmic.c
+++ b/src/soc/intel/skylake/nhlt/dmic.c
@@ -2,6 +2,39 @@

#include <soc/nhlt.h>

+static const struct nhlt_format_config dmic_1ch_formats[] = {
+	/* 48 KHz 16-bits per sample. */
+	{
+		.num_channels = 1,
+		.sample_freq_khz = 48,
+		.container_bits_per_sample = 16,
+		.valid_bits_per_sample = 16,
+		.speaker_mask = SPEAKER_FRONT_CENTER,
+		.settings_file = "dmic-1ch-48khz-16b.bin",
+	},
+};
+
+static const struct nhlt_dmic_array_config dmic_1ch_mic_config = {
+	.tdm_config = {
+		.config_type = NHLT_TDM_BASIC,
+	},
+	.array_type = NHLT_MIC_ARRAY_VENDOR_DEFINED,
+};
+
+static const struct nhlt_endp_descriptor dmic_1ch_descriptors[] = {
+	{
+		.link = NHLT_LINK_PDM,
+		.device = NHLT_PDM_DEV_CAVS15,
+		.direction = NHLT_DIR_CAPTURE,
+		.vid = NHLT_VID,
+		.did = NHLT_DID_DMIC,
+		.cfg = &dmic_1ch_mic_config,
+		.cfg_size = sizeof(dmic_1ch_mic_config),
+		.formats = dmic_1ch_formats,
+		.num_formats = ARRAY_SIZE(dmic_1ch_formats),
+	},
+};
+
 static const struct nhlt_format_config dmic_2ch_formats[] = {
    /* 48 KHz 16-bits per sample. */
    {
@@ -91,6 +124,9 @@
 int nhlt_soc_add_dmic_array(struct nhlt *nhlt, int num_channels)
 {
    switch (num_channels) {
+	case 1:
+		return nhlt_add_endpoints(nhlt, dmic_1ch_descriptors,
+					ARRAY_SIZE(dmic_1ch_descriptors));
    case 2:
    	return nhlt_add_endpoints(nhlt, dmic_2ch_descriptors,
    				ARRAY_SIZE(dmic_2ch_descriptors));